Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r482634 - in
 /db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests:
 master/DerbyNet/holdCursorIJ.out master/holdCursorIJ.out
 master/j9_13/holdCursorIJ.out tests/lang/holdCursorIJ.sql
Date: Tue, 05 Dec 2006 13:06:57 -0000
To: derby-commits@db.apache.org
From: myrnavl@apache.org
Message-Id: <20061205130657.76CB31A984A@eris.apache.org>

Author: myrnavl
Date: Tue Dec  5 05:06:55 2006
New Revision: 482634

URL: http://svn.apache.org/viewvc?view=rev&rev=482634
Log:
No JIRA - backporting part of revision 164284 which overcomes a difference in the test run on 10.0 between IBM jvms 1.4.2 and 1.5 with JCC 2.6.90.

Modified:
    db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out
    db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
    db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/holdCursorIJ.out
    db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql

Modified: db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out?view=diff&rev=482634&r1=482633&r2=482634
==============================================================================
--- db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out (original)
+++ db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/holdCursorIJ.out Tue Dec  5 05:06:55 2006
@@ -45,6 +45,9 @@
 ij> close jdk4;
 ij> next jdk4;
 IJ ERROR: Unable to establish cursor
+ij> -- clean up.
+close jdk1;
+ij> close jdk2;
 ij> -- second test - make sure that all the cursors (including holdability true)
 ----- have their resultsets closed after rollback.
 ----- declare the cursors again, this time, try with rollback
@@ -74,6 +77,10 @@
 ERROR (no SQLState): Invalid operation: result set closed
 ij> next jdk4;
 ERROR (no SQLState): Invalid operation: result set closed
+ij> -- clean up.
+close jdk1;
+ij> close jdk2;
+ij> close jdk4;
 ij> -- third test - Define a hold cursor on a table. Shouldn't be able to drop that
 ----- table before & after commit. Have to close the cursor before table can be dropped.
 get with nohold cursor jdk1 as 'SELECT * FROM t1';
@@ -97,6 +104,8 @@
 close jdk4;
 ij> drop table t1;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- recreate and populate the table for next test
 create table t1(c11 int, c12 int);
 0 rows inserted/updated/deleted
@@ -127,6 +136,8 @@
 close jdk4;
 ij> set isolation to serializable;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- fifth test - try isolation level change alongwith changing the isolation
 ----- level of just one statement
 get with hold cursor jdk4 as 'SELECT * FROM t1';
@@ -151,11 +162,13 @@
 0 rows inserted/updated/deleted
 ij> set isolation RS;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- sixth test - try positioned update with hold cursor
 get with hold cursor jdk4 as 'SELECT * FROM t1 FOR UPDATE';
 ij> -- following should give error because cursor is not positioned on any row
 update t1 set c12=12 where current of jdk4;
-ERROR XCL08: Cursor 'SQL_CURSH200C2' is not on a row.
+ERROR XCL08: Cursor 'SQL_CURSH200C1' is not on a row.
 ij> select * from t1;
 C11 |C12        
 -----
@@ -205,7 +218,7 @@
 get with hold cursor jdk4 as 'SELECT * FROM t1 FOR UPDATE';
 ij> -- following should give error because cursor is not positioned on any row
 delete from t1 where current of jdk4;
-ERROR XCL08: Cursor 'SQL_CURSH200C2' is not on a row.
+ERROR XCL08: Cursor 'SQL_CURSH200C1' is not on a row.
 ij> select * from t1;
 C11 |C12        
 -----
@@ -297,4 +310,8 @@
 1 |1          
 ij> update t1 set c12=c12+1 where current of scrollCursor;
 1 row inserted/updated/deleted
+ij> -- clean up.
+close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out?view=diff&rev=482634&r1=482633&r2=482634
==============================================================================
--- db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out (original)
+++ db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/holdCursorIJ.out Tue Dec  5 05:06:55 2006
@@ -45,6 +45,9 @@
 ij> close jdk4;
 ij> next jdk4;
 IJ ERROR: Unable to establish cursor
+ij> -- clean up.
+close jdk1;
+ij> close jdk2;
 ij> -- second test - make sure that all the cursors (including holdability true)
 -- have their resultsets closed after rollback.
 -- declare the cursors again, this time, try with rollback
@@ -74,6 +77,10 @@
 ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
 ij> next jdk4;
 ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ij> -- clean up.
+close jdk1;
+ij> close jdk2;
+ij> close jdk4;
 ij> -- third test - Define a hold cursor on a table. Shouldn't be able to drop that
 -- table before & after commit. Have to close the cursor before table can be dropped.
 get with nohold cursor jdk1 as 'SELECT * FROM t1';
@@ -97,6 +104,8 @@
 close jdk4;
 ij> drop table t1;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- recreate and populate the table for next test
 create table t1(c11 int, c12 int);
 0 rows inserted/updated/deleted
@@ -127,6 +136,8 @@
 close jdk4;
 ij> set isolation to serializable;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- fifth test - try isolation level change alongwith changing the isolation
 -- level of just one statement
 get with hold cursor jdk4 as 'SELECT * FROM t1';
@@ -151,6 +162,8 @@
 0 rows inserted/updated/deleted
 ij> set isolation RS;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
 ij> -- sixth test - try positioned update with hold cursor
 get with hold cursor jdk4 as 'SELECT * FROM t1 FOR UPDATE';
 ij> -- following should give error because cursor is not positioned on any row
@@ -297,4 +310,8 @@
 1          |1          
 ij> update t1 set c12=c12+1 where current of scrollCursor;
 ERROR 24000: Invalid cursor state - no current row.
+ij> -- clean up.
+close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/holdCursorIJ.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/holdCursorIJ.out?view=diff&rev=482634&r1=482633&r2=482634
==============================================================================
--- db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/holdCursorIJ.out (original)
+++ db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/master/j9_13/holdCursorIJ.out Tue Dec  5 05:06:55 2006
@@ -43,6 +43,11 @@
 ij> close jdk4;
 ij> next jdk4;
 IJ ERROR: Unable to establish cursor
+ij> -- clean up.
+close jdk1;
+IJ ERROR: Unable to establish cursor
+ij> close jdk2;
+IJ ERROR: Unable to establish cursor
 ij> -- second test - make sure that all the cursors (including holdability true)
 -- have their resultsets closed after rollback.
 -- declare the cursors again, this time, try with rollback
@@ -70,6 +75,12 @@
 IJ ERROR: Unable to establish cursor
 ij> next jdk4;
 ERROR XCL16: ResultSet not open, operation 'next' not permitted. Verify that autocommit is OFF.
+ij> -- clean up.
+close jdk1;
+IJ ERROR: Unable to establish cursor
+ij> close jdk2;
+IJ ERROR: Unable to establish cursor
+ij> close jdk4;
 ij> -- third test - Define a hold cursor on a table. Shouldn't be able to drop that
 -- table before & after commit. Have to close the cursor before table can be dropped.
 get with nohold cursor jdk1 as 'SELECT * FROM t1';
@@ -92,6 +103,9 @@
 close jdk4;
 ij> drop table t1;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
+IJ ERROR: Unable to establish cursor
 ij> -- recreate and populate the table for next test
 create table t1(c11 int, c12 int);
 0 rows inserted/updated/deleted
@@ -121,6 +135,9 @@
 close jdk4;
 ij> set isolation to serializable;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
+IJ ERROR: Unable to establish cursor
 ij> -- fifth test - try isolation level change alongwith changing the isolation
 -- level of just one statement
 get with hold cursor jdk4 as 'SELECT * FROM t1';
@@ -144,6 +161,9 @@
 0 rows inserted/updated/deleted
 ij> set isolation RS;
 0 rows inserted/updated/deleted
+ij> -- clean up.
+close jdk1;
+IJ ERROR: Unable to establish cursor
 ij> -- sixth test - try positioned update with hold cursor
 get with hold cursor jdk4 as 'SELECT * FROM t1 FOR UPDATE';
 ij> -- following should give error because cursor is not positioned on any row
@@ -290,4 +310,8 @@
 1          |1          
 ij> update t1 set c12=c12+1 where current of scrollCursor;
 ERROR 24000: Invalid cursor state - no current row.
+ij> -- clean up.
+close scrollCursor;
+ij> drop table t1;
+0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql?view=diff&rev=482634&r1=482633&r2=482634
==============================================================================
--- db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql (original)
+++ db/derby/code/branches/10.0/java/testing/org/apache/derbyTesting/functionTests/tests/lang/holdCursorIJ.sql Tue Dec  5 05:06:55 2006
@@ -34,6 +34,10 @@
 close jdk4;
 next jdk4;
 
+-- clean up.
+close jdk1;
+close jdk2;
+
 -- second test - make sure that all the cursors (including holdability true)
 -- have their resultsets closed after rollback.
 
@@ -56,6 +60,11 @@
 next jdk2;
 next jdk4;
 
+-- clean up.
+close jdk1;
+close jdk2;
+close jdk4;
+
 -- third test - Define a hold cursor on a table. Shouldn't be able to drop that
 -- table before & after commit. Have to close the cursor before table can be dropped.
 
@@ -74,6 +83,9 @@
 close jdk4;
 drop table t1;
 
+-- clean up.
+close jdk1;
+
 -- recreate and populate the table for next test
 create table t1(c11 int, c12 int);
 insert into t1 values(1,1);
@@ -98,6 +110,9 @@
 close jdk4;
 set isolation to serializable;
 
+-- clean up.
+close jdk1;
+
 -- fifth test - try isolation level change alongwith changing the isolation
 -- level of just one statement
 get with hold cursor jdk4 as 'SELECT * FROM t1';
@@ -113,6 +128,9 @@
 set isolation READ UNCOMMITTED;
 set isolation RS;
 
+-- clean up.
+close jdk1;
+
 -- sixth test - try positioned update with hold cursor
 get with hold cursor jdk4 as 'SELECT * FROM t1 FOR UPDATE';
 -- following should give error because cursor is not positioned on any row
@@ -186,5 +204,8 @@
 next scrollCursor;
 update t1 set c12=c12+1 where current of scrollCursor;
 
+-- clean up.
+close scrollCursor;
 
 
+drop table t1;