db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r919633 - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql tools/org/apache/derby/impl/tools/ij/ij.jj
Date Fri, 05 Mar 2010 21:55:09 GMT
Author: rhillegas
Date: Fri Mar  5 21:55:09 2010
New Revision: 919633

URL: http://svn.apache.org/viewvc?rev=919633&view=rev
Log:
DERBY-4576: Check in Sylvain Leroux's fix to enable ij qualified identifiers on the GET CURSOR
command.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql
    db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out?rev=919633&r1=919632&r2=919633&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/qualifiedIdentifiers.out
Fri Mar  5 21:55:09 2010
@@ -56,9 +56,9 @@
 200        
 300        
 ij(DERBY4550_1)> remove fred_select2;
-ij(DERBY4550_1)> -- setup cursor/switch connection/use
-get scroll insensitive cursor fred_cursor as 'select b from t1';
 ij(DERBY4550_1)> set connection DERBY4550_2;
+ij(DERBY4550_2)> -- cursors
+get scroll insensitive cursor fred_cursor@DERBY4550_1 as 'select b from t1';
 ij(DERBY4550_2)> next fred_cursor@DERBY4550_1;
 B          
 -----------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql?rev=919633&r1=919632&r2=919633&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/qualifiedIdentifiers.sql
Fri Mar  5 21:55:09 2010
@@ -40,9 +40,10 @@
 execute fred_select2;
 remove fred_select2;
 
--- setup cursor/switch connection/use
-get scroll insensitive cursor fred_cursor as 'select b from t1';
 set connection DERBY4550_2;
+
+-- cursors
+get scroll insensitive cursor fred_cursor@DERBY4550_1 as 'select b from t1';
 next fred_cursor@DERBY4550_1;
 -- getcurrentrownumber fred_cursor@DERBY4550_1;
 last fred_cursor@DERBY4550_1;

Modified: db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj?rev=919633&r1=919632&r2=919633&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/ij.jj Fri Mar  5 21:55:09
2010
@@ -2224,7 +2224,7 @@
 		try {
 			Session sn = findSession(qi.getSessionName());
 			
-			st = theConnection.createStatement(
+			st = sn.getConnection().createStatement(
 				scrollType, ResultSet.CONCUR_READ_ONLY, holdType);
 			JDBCDisplayUtil.checkNotNull(st,"cursor");
 			st.setCursorName(qi.getLocalName());



Mime
View raw message