db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r416889 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/jdk16/ master/DerbyNetClient/ master/DerbyNetClient/jdk16/ tests/jdbcapi/
Date Sat, 24 Jun 2006 08:12:50 GMT
Author: kahatlen
Date: Sat Jun 24 01:12:49 2006
New Revision: 416889

URL: http://svn.apache.org/viewvc?rev=416889&view=rev
Log:
DERBY-955: Get derbyall on jdk1.6

This patch contains fixes to the following tests that are failing when
running derbyall with jdk 1.6:

* derbynetclientmats: tools/ieptests.sql

  -updated master file for jdk16

* derbynetclientmats: jdbcapi/parameterMapping.java

  -REMOVED jdk16 specific master file

* derbynetclientmats: jdbcapi/checkDataSource30.java

  -updated checkDataSource30.java and checkDataSource.java to produce
   output that is the same when running with jdk15 and jdk16
  -updated master files to reflect changes in output

* derbynetmats: tools/ieptests.sql

  -updated master file for jdk16

Patch contributed by Olav Sandstå.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/parameterMapping.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
    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/checkDataSource.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk16/ieptests.out
Sat Jun 24 01:12:49 2006
@@ -780,7 +780,7 @@
 ERROR 38000: The exception 'SQL Exception: 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 'Group.ORDER' does not exist.' was thrown
while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: 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.
@@ -863,7 +863,7 @@
 ERROR 38000: The exception 'SQL Exception: 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 'INVENTORY.ordertable' does not exist.'
was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: 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/checkDataSource.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
Sat Jun 24 01:12:49 2006
@@ -55,8 +55,8 @@
 ConnectionPoolDataSource <closedstmt>.execute() 08003 - No current connection.
 Changes rolled back OK in auto closed pooled connection
 EVENT(1):connectionClosed
-expected java.sql.SQLException: ResultSet not open.  Verify that autocommit is OFF.
-expected java.sql.SQLException: No current connection.
+expected SQL Exception: (XCL16) ResultSet not open.  Verify that autocommit is OFF.
+expected SQL Exception: (08003) No current connection.
 Start testPoolReset ConnectionPoolDataSource
 IDENTITY_VAL_LOCAL=1
 IDENTITY_VAL_LOCAL=2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
Sat Jun 24 01:12:49 2006
@@ -1,6 +1,6 @@
 Running JDBC 3.0 connection checks on DriverManager 
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DriverManager 
   isolation level 2
   auto commit     true
@@ -14,7 +14,7 @@
 DriverManager  <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on DataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DataSource
   isolation level 2
   auto commit     true
@@ -29,7 +29,7 @@
 DataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -48,7 +48,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -67,8 +67,8 @@
 ConnectionPoolDataSource <closedstmt>.execute() 08003 - No current connection.
 Changes rolled back OK in auto closed pooled connection
 EVENT(1):connectionClosed
-expected java.sql.SQLException: ResultSet not open.  Verify that autocommit is OFF.
-expected java.sql.SQLException: No current connection.
+expected SQL Exception: (XCL16) ResultSet not open.  Verify that autocommit is OFF.
+expected SQL Exception: (08003) No current connection.
 Start testPoolReset ConnectionPoolDataSource
 IDENTITY_VAL_LOCAL=1
 IDENTITY_VAL_LOCAL=2
@@ -76,7 +76,7 @@
 End testPoolReset ConnectionPoolDataSource
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -102,7 +102,7 @@
 End testPoolReset XADataSource
 Running JDBC 3.0 connection checks on DriverManager 
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DriverManager 
   isolation level 2
   auto commit     true
@@ -116,7 +116,7 @@
 DriverManager  <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on DataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DataSource
   isolation level 2
   auto commit     true
@@ -131,7 +131,7 @@
 DataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -150,7 +150,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -169,7 +169,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -188,7 +188,7 @@
 XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -208,7 +208,7 @@
 EVENT(5):connectionClosed
 Running JDBC 3.0 connection checks on Global XADataSource
   holdability     false
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Global XADataSource
   isolation level 2
   auto commit     false
@@ -226,7 +226,7 @@
 Global XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on Global XADataSource
   holdability     false
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Global XADataSource
   isolation level 2
   auto commit     false
@@ -244,7 +244,7 @@
 Global XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on Switch to local XADataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to local XADataSource
   isolation level 2
   auto commit     true
@@ -263,7 +263,7 @@
 Switch to local XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on Switch to local XADataSource
   holdability     true
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to local XADataSource
   isolation level 2
   auto commit     true
@@ -282,7 +282,7 @@
 Switch to local XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on Switch to global XADataSource
   holdability     false
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to global XADataSource
   isolation level 2
   auto commit     false
@@ -301,7 +301,7 @@
 Switch to global XADataSource <closedstmt>.execute() 08003 - No current connection.
 Running JDBC 3.0 connection checks on Switch to global XADataSource
   holdability     false
-JDBC 3.0 savepoint java.sql.SQLException: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to global XADataSource
   isolation level 2
   auto commit     false

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=416889&r1=416888&r2=416889&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
Sat Jun 24 01:12:49 2006
@@ -780,7 +780,7 @@
 ERROR 38000: The exception 'SQL Exception: 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 'Group.ORDER' does not exist.' was thrown
while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: 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.
@@ -863,7 +863,7 @@
 ERROR 38000: The exception 'SQL Exception: 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 'INVENTORY.ordertable' does not exist.'
was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: 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/checkDataSource.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
Sat Jun 24 01:12:49 2006
@@ -72,8 +72,8 @@
 ConnectionPoolDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Changes rolled back OK in auto closed pooled connection
 EVENT(1):connectionClosed
-expected SQL Exception: No current connection.
-expected SQL Exception: No current connection.
+expected SQL Exception: (08003) No current connection.
+expected SQL Exception: (08003) No current connection.
 Start testPoolReset ConnectionPoolDataSource
 IDENTITY_VAL_LOCAL=1
 IDENTITY_VAL_LOCAL=2

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
Sat Jun 24 01:12:49 2006
@@ -14,7 +14,7 @@
 Nested <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on DriverManager 
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DriverManager 
   isolation level 2
   auto commit     true
@@ -28,7 +28,7 @@
 DriverManager  <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on DataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DataSource
   isolation level 2
   auto commit     true
@@ -43,7 +43,7 @@
 DataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on SimpleDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on SimpleDataSource
   isolation level 2
   auto commit     true
@@ -58,7 +58,7 @@
 SimpleDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -74,7 +74,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -90,8 +90,8 @@
 ConnectionPoolDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Changes rolled back OK in auto closed pooled connection
 EVENT(1):connectionClosed
-expected SQL Exception: No current connection.
-expected SQL Exception: No current connection.
+expected SQL Exception: (08003) No current connection.
+expected SQL Exception: (08003) No current connection.
 Start testPoolReset ConnectionPoolDataSource
 IDENTITY_VAL_LOCAL=1
 IDENTITY_VAL_LOCAL=2
@@ -99,7 +99,7 @@
 End testPoolReset ConnectionPoolDataSource
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -137,7 +137,7 @@
 Nested <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on DriverManager 
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DriverManager 
   isolation level 2
   auto commit     true
@@ -151,7 +151,7 @@
 DriverManager  <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on DataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on DataSource
   isolation level 2
   auto commit     true
@@ -166,7 +166,7 @@
 DataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on EmbeddedSimpleDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on EmbeddedSimpleDataSource
   isolation level 2
   auto commit     true
@@ -181,7 +181,7 @@
 EmbeddedSimpleDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -197,7 +197,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on ConnectionPoolDataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on ConnectionPoolDataSource
   isolation level 2
   auto commit     true
@@ -213,7 +213,7 @@
 ConnectionPoolDataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -229,7 +229,7 @@
 XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on XADataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on XADataSource
   isolation level 2
   auto commit     true
@@ -246,7 +246,7 @@
 EVENT(5):connectionClosed
 Running JDBC 3.0 connection checks on Global XADataSource
   holdability     false
-JDBC 3.0 savepoint SQL Exception: Cannot rollback a global transaction using the Connection,
commit processing must go thru XAResource interface.
+JDBC 3.0 savepoint SQL Exception: (XJ058) Cannot rollback a global transaction using the
Connection, commit processing must go thru XAResource interface.
 Running connection checks on Global XADataSource
   isolation level 2
   auto commit     false
@@ -261,7 +261,7 @@
 Global XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on Global XADataSource
   holdability     false
-JDBC 3.0 savepoint SQL Exception: Cannot rollback a global transaction using the Connection,
commit processing must go thru XAResource interface.
+JDBC 3.0 savepoint SQL Exception: (XJ058) Cannot rollback a global transaction using the
Connection, commit processing must go thru XAResource interface.
 Running connection checks on Global XADataSource
   isolation level 2
   auto commit     false
@@ -276,7 +276,7 @@
 Global XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on Switch to local XADataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to local XADataSource
   isolation level 2
   auto commit     true
@@ -292,7 +292,7 @@
 Switch to local XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on Switch to local XADataSource
   holdability     true
-JDBC 3.0 savepoint SQL Exception: Cannot issue savepoint when autoCommit is on.
+JDBC 3.0 savepoint SQL Exception: (XJ010) Cannot issue savepoint when autoCommit is on.
 Running connection checks on Switch to local XADataSource
   isolation level 2
   auto commit     true
@@ -308,7 +308,7 @@
 Switch to local XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on Switch to global XADataSource
   holdability     false
-JDBC 3.0 savepoint SQL Exception: Cannot rollback a global transaction using the Connection,
commit processing must go thru XAResource interface.
+JDBC 3.0 savepoint SQL Exception: (XJ058) Cannot rollback a global transaction using the
Connection, commit processing must go thru XAResource interface.
 Running connection checks on Switch to global XADataSource
   isolation level 2
   auto commit     false
@@ -324,7 +324,7 @@
 Switch to global XADataSource <closedstmt>.execute() XJ012 - 'Statement' already closed.
 Running JDBC 3.0 connection checks on Switch to global XADataSource
   holdability     false
-JDBC 3.0 savepoint SQL Exception: Cannot rollback a global transaction using the Connection,
commit processing must go thru XAResource interface.
+JDBC 3.0 savepoint SQL Exception: (XJ058) Cannot rollback a global transaction using the
Connection, commit processing must go thru XAResource interface.
 Running connection checks on Switch to global XADataSource
   isolation level 2
   auto commit     false

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
Sat Jun 24 01:12:49 2006
@@ -219,14 +219,16 @@
 			rs.next();
 			System.out.println("FAIL - ResultSet is open for a closed connection obtained from PooledConnection");
 		} catch (SQLException sqle) {
-			System.out.println("expected " + sqle.toString());
+			System.out.println("expected SQL Exception: (" + sqle.getSQLState()
+                              + ") " + sqle.getMessage());
 		}
 
 		try {
 			s.executeUpdate("update t set i = 1");
 			System.out.println("FAIL - Statement is open for a closed connection obtained from PooledConnection");
 		} catch (SQLException sqle) {
-			System.out.println("expected " + sqle.toString());
+			System.out.println("expected SQL Exception: (" + sqle.getSQLState()
+                              + ") " + sqle.getMessage());
 		}
 
 		pc.close();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java?rev=416889&r1=416888&r2=416889&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java
Sat Jun 24 01:12:49 2006
@@ -93,7 +93,8 @@
 		} catch (SQLException sqle) {
 			// we expect savepoints exceptions because either
 			// it's a global transaction, or it's in auto commit mode.
-			System.out.println("JDBC 3.0 savepoint " + sqle.toString());
+			System.out.println("JDBC 3.0 savepoint SQL Exception: (" +
+                              sqle.getSQLState() + ") " + sqle.getMessage());
 		}
 
 



Mime
View raw message