svn commit: r425446 [3/3] - in /db/derby/code/trunk: ./ java/shared/org/apache/derby/shared/common/reference/ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ java/testing/or...

[da...@apache.org]

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out?rev=425446&r1=425445&r2=425446&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out Tue Jul 25 09:22:05 2006
@@ -138,7 +138,7 @@
 EXPECTED SQL Exception: (42Y03) 'IR' is not recognized as a function or procedure.
 No ResultSet or update count returned
 No ResultSet or update count returned
-EXPECTED SQL Exception: The exception 'SQL Exception: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression. SQLSTATE: 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.
+EXPECTED SQL Exception: The exception 'java.sql.SQLException: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression. SQLSTATE: 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.
 No ResultSet or update count returned
 No ResultSet or update count returned
 No ResultSet or update count returned
@@ -154,7 +154,7 @@
 5 |ir2            
 6 |'012345678     
 CALL IR2(2, 'no way')
-EXPECTED SQL Exception: (38000) The exception 'SQL Exception: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression. SQLSTATE: 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.
+EXPECTED SQL Exception: (38000) The exception 'java.sql.SQLException: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression. SQLSTATE: 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.
 CALL IR2(?, 'no way')
 EXPECTED SQL Exception: (07000) At least one parameter to the current statement is uninitialized.
 CALL IR2(2, ?)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out?rev=425446&r1=425445&r2=425446&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/procedureInTrigger.out Tue Jul 25 09:22:05 2006
@@ -395,7 +395,7 @@
 0 rows inserted/updated/deleted
 ij> --- try to insert 2 rows
 insert into t2 values (1,2), (2,4);
-ERROR 38000: The exception 'SQL Exception: The external routine is not allowed to execute SQL statements.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The external routine is not allowed to execute SQL statements.' was thrown while evaluating an expression.
 ERROR 38001: The external routine is not allowed to execute SQL statements.
 ij> --- check trigger is not fired.
 select * from t1;
@@ -424,7 +424,7 @@
 ij> --- causing the trigger to fire again will violate the primary key constraint
 --- verify this fails
 update t1 set i=i;
-ERROR 38000: The exception 'SQL Exception: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.' was thrown while evaluating an expression.
 ERROR 23505: The statement was aborted because it would have caused a duplicate key value in a unique or primary key constraint or unique index identified by 'xxxxGENERATED-IDxxxx' defined on 'T1'.
 ij> --- check that the update failed
 select * from t1;
@@ -591,7 +591,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
 ERROR X0Y66: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.
 ij> --- check delete failed
 select * from t2;
@@ -606,7 +606,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
 ERROR X0Y66: Cannot issue commit in a nested connection when there is a pending operation in the parent connection.
 ij> --- check delete failed
 select * from t2;
@@ -622,7 +622,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
 ERROR X0Y67: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.
 ij> --- check delete failed
 select * from t2;
@@ -637,7 +637,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.' was thrown while evaluating an expression.
 ERROR X0Y67: Cannot issue rollback in a nested connection when there is a pending operation in the parent connection.
 ij> --- check delete failed
 select * from t2;
@@ -653,7 +653,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.' was thrown while evaluating an expression.
 ERROR X0Y71: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.
 ij> --- check delete failed
 select * from t2;
@@ -668,7 +668,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail 
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.' was thrown while evaluating an expression.
 ERROR X0Y71: Transaction manipulation such as SET ISOLATION is not permitted because trigger SET_ISOLATION_TRIG is active.
 ij> --- check delete failed
 select * from t2;
@@ -718,7 +718,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
-ERROR 38000: The exception 'SQL Exception: ALTER TABLE T1 is not supported in trigger ALTER_TABLE_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: ALTER TABLE T1 is not supported in trigger ALTER_TABLE_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: ALTER TABLE T1 is not supported in trigger ALTER_TABLE_TRIG.
 ij> --- check delete failed
 select * from t1;
@@ -734,7 +734,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: DROP TABLE T1 is not supported in trigger DROP_TABLE_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: DROP TABLE T1 is not supported in trigger DROP_TABLE_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: DROP TABLE T1 is not supported in trigger DROP_TABLE_TRIG.
 ij> --- check delete failed
 select * from t2;
@@ -750,7 +750,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
-ERROR 38000: The exception 'SQL Exception: CREATE TRIGGER TEST_TRIG is not supported in trigger CREATE_TRIGGER_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: CREATE TRIGGER TEST_TRIG is not supported in trigger CREATE_TRIGGER_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: CREATE TRIGGER TEST_TRIG is not supported in trigger CREATE_TRIGGER_TRIG.
 ij> --- check delete failed
 select * from t1;
@@ -774,7 +774,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: DROP TRIGGER TEST_TRIG is not supported in trigger DROP_TRIGGER_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: DROP TRIGGER TEST_TRIG is not supported in trigger DROP_TRIGGER_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: DROP TRIGGER TEST_TRIG is not supported in trigger DROP_TRIGGER_TRIG.
 ij> --- check delete failed
 select * from t2;
@@ -795,7 +795,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t2;
-ERROR 38000: The exception 'SQL Exception: CREATE INDEX IX is not supported in trigger CREATE_INDEX_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: CREATE INDEX IX is not supported in trigger CREATE_INDEX_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: CREATE INDEX IX is not supported in trigger CREATE_INDEX_TRIG.
 ij> --- check delete failed
 select * from t2;
@@ -818,7 +818,7 @@
 0 rows inserted/updated/deleted
 ij> --- should fail
 delete from t1;
-ERROR 38000: The exception 'SQL Exception: DROP INDEX IX is not supported in trigger DROP_INDEX_TRIG.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: DROP INDEX IX is not supported in trigger DROP_INDEX_TRIG.' was thrown while evaluating an expression.
 ERROR X0Y69: DROP INDEX IX is not supported in trigger DROP_INDEX_TRIG.
 ij> --- check delete failed
 select * from t1;