db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r428044 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/ master/DerbyNetClient/jdk16/ master/jdk16/
Date Wed, 02 Aug 2006 16:32:04 GMT
Author: davidvc
Date: Wed Aug  2 09:32:02 2006
New Revision: 428044

URL: http://svn.apache.org/viewvc?rev=428044&view=rev
Log:
DERBY-1616: Lots of jdk1.6 regression test failures with diffs because 
of SQL Exception instead of java.sql.SQLException

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/Sed.java
Wed Aug  2 09:32:02 2006
@@ -39,7 +39,8 @@
 
 public class Sed
 {
-	private	static	final	String	SQL_EXCEPTION_FILTERED_SUBSTITUTION = "SQL Exception:";
+	private	static	final	String	SQL_EXCEPTION_FILTERED_SUBSTITUTION = 
+        "java.sql.SQLException:";
 
     public Sed()
     {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/ieptests.out
Wed Aug  2 09:32:02 2006
@@ -291,7 +291,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -350,7 +350,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 1) ;
-ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -401,7 +401,7 @@
 ij> --file not found error should rollback 
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 ij> commit;
 ij> select * from t1 ;
 A          
@@ -453,7 +453,7 @@
 ij> --following import will back , but should not have any impact on inserts
 call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
-ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 ij> select * from t1 ;
 A          
 -----
@@ -563,7 +563,7 @@
 3 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null, 1) ;
-ERROR 38000: The exception 'SQL Exception: Bulk insert replace is not permitted on 'APP.ALLTYPES'
because it has an enabled trigger (TRIG_IMPORT).' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Bulk insert replace is not permitted on
'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT).' was thrown while evaluating
an expression.
 ij> select count(*) from alltypes;
 1          
 -----
@@ -606,7 +606,7 @@
 Statement executed.
 ij> --following import should fail becuase of inserting into identity column.
 CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null, null,1);
-ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was
thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Attempt to modify an identity column 'C2'.'
was thrown while evaluating an expression.
 ij> --following import should be succesful
 CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL, 'TABLE1', 'C1,C3,C4' , '1,3,4', 'extinout/import.del',null,
null, null,1);
 Statement executed.
@@ -623,7 +623,7 @@
                                  null, null, null) ;
 Statement executed.
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null,
null,1);
-ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was
thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Attempt to modify an identity column 'C2'.'
was thrown while evaluating an expression.
 ij> select * from table1;
 C1 |C2 |C3 |C4  
 -----
@@ -645,7 +645,7 @@
 Statement executed.
 ij> --replace should fail because of dependent table
 CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'PARENT', 'extinout/parent.del',null, null, null,1);
-ERROR 38000: The exception 'SQL Exception: INSERT on table 'PARENT' caused a violation of
foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled
back.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: INSERT on table 'PARENT' caused a violation
of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled
back.' was thrown while evaluating an expression.
 ij> select * from parent;
 A          
 -----
@@ -726,7 +726,7 @@
 ij> create table dest_by_default(i int generated by default as identity);
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,0);
-ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'I'.' was
thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Attempt to modify an identity column 'I'.'
was thrown while evaluating an expression.
 ij> select * from dest_always;
 I          
 -----
@@ -747,7 +747,7 @@
 ij> create table dest_by_default(i int generated by default as identity);
 0 rows inserted/updated/deleted
 ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,1);
-ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'I'.' was
thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Attempt to modify an identity column 'I'.'
was thrown while evaluating an expression.
 ij> select * from dest_always;
 I          
 -----
@@ -777,13 +777,13 @@
 1 row inserted/updated/deleted
 ij> --following export should fail because schema name is not matching the way it is defined
using delimited quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('GROUP', 'Order' , 'extinout/order.dat', null, null,
null) ;
-ERROR 38000: The exception 'SQL Exception: Schema 'GROUP' does not exist' was thrown while
evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Schema 'GROUP' does not exist' was thrown
while evaluating an expression.
 ij> --following export should fail because table name is not matching the way it is defined
in the quotes.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null,
null) ;
-ERROR 38000: The exception 'SQL Exception: Table/View 'Group.ORDER' does not exist.' was
thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Table/View 'Group.ORDER' does not exist.'
was thrown while evaluating an expression.
 ij> --following export should fail because of unquoted table name that is a reserved word.
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group".Order' , 'extinout/order.dat' ,
   null , null , null ) ;
-ERROR 38000: The exception 'SQL Exception: Syntax error: Encountered "Order" at line 1, column
23.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Syntax error: Encountered "Order" at line
1, column 23.' was thrown while evaluating an expression.
 ij> --following exports should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'Order' , 'extinout/order.dat', null, null,
null) ;
 Statement executed.
@@ -860,10 +860,10 @@
 1 row inserted/updated/deleted
 ij> --following export should fail because schema name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('inventory', 'ORDERTABLE' , 'extinout/order.dat', null,
null, null) ;
-ERROR 38000: The exception 'SQL Exception: Schema 'inventory' does not exist' was thrown
while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Schema 'inventory' does not exist' was
thrown while evaluating an expression.
 ij> --following export should fail because table name is not in upper case.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null,
null, null) ;
-ERROR 38000: The exception 'SQL Exception: Table/View 'INVENTORY.ordertable' does not exist.'
was thrown while evaluating an expression.
+ERROR 38000: The exception 'java.sql.SQLException: Table/View 'INVENTORY.ordertable' does
not exist.' was thrown while evaluating an expression.
 ij> --following export should pass.
 call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null,
null, null) ;
 Statement executed.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/importExport.out
Wed Aug  2 09:32:02 2006
@@ -1,8 +1,8 @@
 Test importExport starting
 testing non-existing data file
-The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 testing null data file
-The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
+The exception 'java.sql.SQLException: The exception 'java.lang.reflect.InvocationTargetException'
was thrown while evaluating an expression.' was thrown while evaluating an expression.
 testing empty table
 testing empty table with Delimited format
 testing empty table import Field/Char Delimiters
@@ -17,7 +17,7 @@
 testing datatypes that does not have Export Supprt
 Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.
  
 Column 'C1' in the table is of type BLOB, it is not supported by the import/export feature.
  
-The exception 'SQL Exception: Read endOfFile at unexpected place on line 2.' was thrown while
evaluating an expression.
+The exception 'java.sql.SQLException: Read endOfFile at unexpected place on line 2.' was
thrown while evaluating an expression.
 PASS: finished testing import and export
 PASS: teardown complete
 PASS: finished cleaning up the temporary objects from database

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/procedure.out
Wed Aug  2 09:32:02 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.
+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.
 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.
+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.
 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/jdk16/closed.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/closed.out
Wed Aug  2 09:32:02 2006
@@ -12,16 +12,16 @@
 ERROR 08003: No current connection.
 ERROR 08003: No current connection.
 Test database shutdown ...
-SQL Exception: Database 'wombat' shutdown.
-Caused by: SQL Exception: Database 'wombat' shutdown.
+java.sql.SQLException: Database 'wombat' shutdown.
+Caused by: java.sql.SQLException: Database 'wombat' shutdown.
 	... 13 more
 CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
 LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.
 ERROR 08006: Database 'wombat' shutdown.
 Shutdown test completed.
 Test system shutdown ...
-SQL Exception: Database 'wombat' shutdown.
-Caused by: SQL Exception: Database 'wombat' shutdown.
+java.sql.SQLException: Database 'wombat' shutdown.
+Caused by: java.sql.SQLException: Database 'wombat' shutdown.
 	... 13 more
 CALL sleep(10000) - 38000, 38000 -- InterruptedException, XJ001 -- InterruptedException
 LOCK TABLE CLOSED.LOCKME IN EXCLUSIVE MODE - 08006, 08006 -- Database 'wombat' shutdown.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out?rev=428044&r1=428043&r2=428044&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/jdk16/releaseCompileLocks.out
Wed Aug  2 09:32:02 2006
@@ -28,10 +28,10 @@
 from sys.systables where tablename = 'SYSCONGLOMERATES';
 1          
 -----------
-Caught exception SQL Exception: The external routine is not allowed to execute SQL statements.
-SQL Exception: The external routine is not allowed to execute SQL statements.
-Caused by: SQL Exception: The external routine is not allowed to execute SQL statements.
-	... 30 more
+Caught exception java.sql.SQLException: The external routine is not allowed to execute SQL
statements.
+java.sql.SQLException: The external routine is not allowed to execute SQL statements.
+Caused by: java.sql.SQLException: The external routine is not allowed to execute SQL statements.
+	... 31 more
 1          
 ij> select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table
 order by 1;
@@ -48,10 +48,10 @@
 from sys.systables where tablename = 'SYSCONGLOMERATES';
 1          
 -----------
-Caught exception SQL Exception: The external routine is not allowed to execute SQL statements.
-SQL Exception: The external routine is not allowed to execute SQL statements.
-Caused by: SQL Exception: The external routine is not allowed to execute SQL statements.
-	... 30 more
+Caught exception java.sql.SQLException: The external routine is not allowed to execute SQL
statements.
+java.sql.SQLException: The external routine is not allowed to execute SQL statements.
+Caused by: java.sql.SQLException: The external routine is not allowed to execute SQL statements.
+	... 31 more
 1          
 ij> -- only two locks!
 select TYPE, MODE, TABLENAME, LOCKNAME, STATE from syscs_diag.lock_table



Mime
View raw message