db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davi...@apache.org
Subject svn commit: r395004 - in /db/derby/code/trunk/java: build/org/apache/derbyBuild/ client/org/apache/derby/client/am/ engine/org/apache/derby/loc/ shared/org/apache/derby/shared/common/reference/ testing/org/apache/derbyTesting/functionTests/master/Derby...
Date Tue, 18 Apr 2006 19:29:15 GMT
Author: davidvc
Date: Tue Apr 18 12:29:10 2006
New Revision: 395004

URL: http://svn.apache.org/viewcvs?rev=395004&view=rev
Log:
DERBY-842: This fixes the failures in jdbc40 test suite.  Passes 
derbynetclientmats on JDK 4 and jdbc40 test suite on JDK 6


Modified:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
    db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJava.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out

Modified: db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java (original)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/splitmessages.java Tue Apr 18 12:29:10
2006
@@ -88,6 +88,7 @@
         clientMessageIds.add(SQLState.LANG_MISSING_PARMS);
         clientMessageIds.add(SQLState.LANG_NO_CURRENT_ROW);
         clientMessageIds.add(SQLState.LANG_STREAM_RETRIEVED_ALREADY);
+        clientMessageIds.add(SQLState.CLIENT_RESULT_SET_NOT_OPEN);
     }
 
 	public static void main(String[] args) throws Exception {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ResultSet.java Tue Apr 18 12:29:10
2006
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.sql.SQLException;
 import org.apache.derby.shared.common.reference.SQLState;
+import org.apache.derby.shared.common.i18n.MessageUtil;
 
 public abstract class ResultSet implements java.sql.ResultSet,
         ResultSetCallbackInterface,
@@ -4571,8 +4572,7 @@
         if (!openOnClient_) {
             agent_.checkForDeferredExceptions();
             throw new SqlException(agent_.logWriter_, 
-                new MessageId(SQLState.ALREADY_CLOSED),
-                "ResultSet");
+                new MessageId(SQLState.CLIENT_RESULT_SET_NOT_OPEN));
         } else {
             agent_.checkForDeferredExceptions();
         }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_en.properties Tue Apr 18
12:29:10 2006
@@ -1002,7 +1002,9 @@
 XCL13.S=The parameter position ''{0}'' is out of range.  The number of parameters for this
prepared  statement is ''{1}''.
 XCL14.S=The column position ''{0}'' is out of range.  The number of columns for this ResultSet
is ''{1}''.
 XCL15.S=A ClassCastException occurred when calling the compareTo() method on an object ''{0}''.
 The parameter to compareTo() is of class ''{1}''.
-XCL16.S=ResultSet not open. Operation ''{0}'' not permitted. Verify that autocommit is OFF.
+XCL16.S.0=ResultSet not open. Operation ''{0}'' not permitted. Verify that autocommit is
OFF.
+# This one is used for the network client, where we don't know what operation is being performed.
+XCL16.S.1=ResultSet not open.  Verify that autocommit is OFF.
 XCL17.S=Statement not allowed in this database.
 XCL18.S=Stream of column value in result cannot be retrieved twice
 XCL19.S=Missing row in table ''{0}'' for key ''{1}''.

Modified: db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
(original)
+++ db/derby/code/trunk/java/shared/org/apache/derby/shared/common/reference/SQLState.java
Tue Apr 18 12:29:10 2006
@@ -1285,7 +1285,8 @@
 	String LANG_INVALID_PARAM_POSITION                                 = "XCL13.S";
 	String LANG_INVALID_COLUMN_POSITION                                 = "XCL14.S";
 	String LANG_INVALID_COMPARE_TO                                     = "XCL15.S";
-	String LANG_RESULT_SET_NOT_OPEN                                    = "XCL16.S";
+	String LANG_RESULT_SET_NOT_OPEN                                    = "XCL16.S.0";
+    String CLIENT_RESULT_SET_NOT_OPEN                                  = "XCL16.S.1";
     String LANG_STREAM_RETRIEVED_ALREADY = "XCL18.S";
 	String LANG_MISSING_ROW                                            = "XCL19.S";
 	String LANG_CANT_UPGRADE_CATALOGS                                  = "XCL20.S";

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorIJ.out
Tue Apr 18 12:29:10 2006
@@ -32,9 +32,9 @@
 ij> -- now try the fetch on cursors again after commit
 ----- cursors jdk1 and jdk2 will give errors
 next jdk1;
-ERROR XJ012: 'ResultSet' already closed.
+ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XJ012: 'ResultSet' already closed.
+ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
 ij> next jdk4;
 C11 |C12        
 -----
@@ -72,11 +72,11 @@
 ij> -- now try the fetch on cursors again after rollback
 ----- all the cursors will give errors
 next jdk1;
-ERROR XJ012: 'ResultSet' already closed.
+ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
 ij> next jdk2;
-ERROR XJ012: 'ResultSet' already closed.
+ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
 ij> next jdk4;
-ERROR XJ012: 'ResultSet' already closed.
+ERROR XCL16: ResultSet not open.  Verify that autocommit is OFF.
 ij> -- clean up.
 close jdk1;
 ij> close jdk2;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJava.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJava.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJava.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/holdCursorJava.out
Tue Apr 18 12:29:10 2006
@@ -9,7 +9,7 @@
 checkResultSet before commit
 21, testtable2-one
 checkResultSet after commit
-EXPECTED EXCEPTION:'ResultSet' already closed.
+EXPECTED EXCEPTION:ResultSet not open.  Verify that autocommit is OFF.
 testStatementsInProcedure()
 checkResultSet before commit
 11, testtable1-one
@@ -28,7 +28,7 @@
 checkResultSet before commit
 21, testtable2-one
 checkResultSet after commit
-EXPECTED EXCEPTION:'ResultSet' already closed.
+EXPECTED EXCEPTION:ResultSet not open.  Verify that autocommit is OFF.
 testStatementsInProcedure()
 checkResultSet before commit
 11, testtable1-one

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/updatableResultSet.out
Tue Apr 18 12:29:10 2006
@@ -74,10 +74,10 @@
 Got expected exception Invalid operation at current cursor position.
 Negative Test8 - attempt deleteRow & updateRow on updatable resultset after closing the
resultset
 Make sure that we got CONCUR_UPDATABLE? true
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
 Negative Test9 - try updatable resultset on system table
 SQL State : 42Y90
 Got expected exception FOR UPDATE is not permitted in this type of statement.  
@@ -3195,18 +3195,18 @@
 Positive and negative tests 43 - Commit while on insertRow
 Positive test 43 - Commit while on insertRow with holdable cursor
 Negative test 43 - Commit while on insertRow with not holdable cursor
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44 - Closed RS
 Negative test 44.a - try insertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.b - try moveToCurrentRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.c - try moveToInsertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Positive test 45 - try to insert without updating all columns. All columns allow nulls or
have a default value
 Positive test 46 - Rollback with AutoCommit on
 Negative test 47 - insertRow and read-only RS

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk16/updatableResultSet.out
Tue Apr 18 12:29:10 2006
@@ -74,10 +74,10 @@
 Got expected exception Invalid operation at current cursor position.
 Negative Test8 - attempt deleteRow & updateRow on updatable resultset after closing the
resultset
 Make sure that we got CONCUR_UPDATABLE? true
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
 Negative Test9 - try updatable resultset on system table
 SQL State : 42Y90
 Got expected exception FOR UPDATE is not permitted in this type of statement.  
@@ -3195,18 +3195,18 @@
 Positive and negative tests 43 - Commit while on insertRow
 Positive test 43 - Commit while on insertRow with holdable cursor
 Negative test 43 - Commit while on insertRow with not holdable cursor
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44 - Closed RS
 Negative test 44.a - try insertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.b - try moveToCurrentRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.c - try moveToInsertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Positive test 45 - try to insert without updating all columns. All columns allow nulls or
have a default value
 Positive test 46 - Rollback with AutoCommit on
 Negative test 47 - insertRow and read-only RS

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedureJdbc30.out
Tue Apr 18 12:29:10 2006
@@ -2,80 +2,80 @@
   PASS 1 got result set true
      RS (1) val 2
   PASS 2 got result set true
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (2) val 3
   PASS 3 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (3) val 4
   PASS 4 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (4) val 5
   PASS 5 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (5) val 6
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
 Fetching result sets with getMoreResults(Statement.CLOSE_CURRENT_RESULT)
   PASS 1 got result set true
      RS (1) val 2
   PASS 2 got result set true
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (2) val 3
   PASS 3 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (3) val 4
   PASS 4 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (4) val 5
   PASS 5 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (5) val 6
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
 Fetching result sets with getMoreResults(Statement.CLOSE_ALL_RESULTS)
   PASS 1 got result set true
      RS (1) val 2
   PASS 2 got result set true
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (2) val 3
   PASS 3 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (3) val 4
   PASS 4 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (4) val 5
   PASS 5 got result set true
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (5) val 6
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
 Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT)
   PASS 1 got result set true
      RS (1) val 2
@@ -108,24 +108,24 @@
      RS (2) val 3
  third with CLOSE_CURRENT_RESULT
      RS (1) val 3
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (3) val 4
  fourth with KEEP_CURRENT_RESULT
      RS (1) val 4
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (3) val 5
      RS (4) val 5
  fifth with CLOSE_ALL_RESULTS
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (5) val 6
  no more results with with KEEP_CURRENT_RESULT
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
      RS (5) val 7
 Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that
cs.execute() closes them
   PASS 1 got result set true
@@ -155,11 +155,11 @@
      RS (4) val 7
      RS (5) val 7
  executing statement
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
 Fetching result sets with getMoreResults(Statement.KEEP_CURRENT_RESULT) and checking that
cs.close() closes them
   PASS 1 got result set true
      RS (1) val 2
@@ -188,8 +188,8 @@
      RS (4) val 7
      RS (5) val 7
  closing statement
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
-     Exception - 'ResultSet' already closed.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.
+     Exception - ResultSet not open.  Verify that autocommit is OFF.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
Tue Apr 18 12:29:10 2006
@@ -969,7 +969,7 @@
 getTimestamp(16): null
 getTimestamp(bl): null
 rs.next() on closed result set got exception 
-ERROR XJ012: 'ResultSet' already closed.
+Result Set Closed Exception
 just auto commit
   bug4810 1, 1
   bug4810 1, 2
@@ -984,7 +984,7 @@
   bug4810 1, 2
 commit
   LOCK TABLE
-ERROR XJ012: 'ResultSet' already closed.
+Result Set Closed Exception
   LOCK TABLE
   LOCK TABLE
 rollback with auto commit
@@ -992,7 +992,7 @@
   bug4810 1, 2
 rollback
   LOCK TABLE
-ERROR XJ012: 'ResultSet' already closed.
+Result Set Closed Exception
   LOCK TABLE
   LOCK TABLE
 START testMutableValues

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out?rev=395004&r1=395003&r2=395004&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/updatableResultSet.out
Tue Apr 18 12:29:10 2006
@@ -74,10 +74,10 @@
 Got expected exception Invalid operation at current cursor position.
 Negative Test8 - attempt deleteRow & updateRow on updatable resultset after closing the
resultset
 Make sure that we got CONCUR_UPDATABLE? true
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
-SQL State : XJ012
-Got expected exception 'ResultSet' already closed.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
+SQL State : XCL16
+Got expected exception ResultSet not open.  Verify that autocommit is OFF.
 Negative Test9 - try updatable resultset on system table
 SQL State : 42Y90
 Got expected exception FOR UPDATE is not permitted in this type of statement.  
@@ -2931,14 +2931,14 @@
 Negative test 43 - Commit while on insertRow with not holdable cursor
 Negative test 44 - Closed RS
 Negative test 44.a - try insertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.b - try moveToCurrentRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Negative test 44.c - try moveToInsertRow on closed RS
-SQL State: XJ012
-Got expected exception: 'ResultSet' already closed.
+SQL State: XCL16
+Got expected exception: ResultSet not open.  Verify that autocommit is OFF.
 Positive test 45 - try to insert without updating all columns. All columns allow nulls or
have a default value
 Positive test 46 - Rollback with AutoCommit on
 Negative test 47 - insertRow and read-only RS



Mime
View raw message