db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r208776 [7/7] - in /incubator/derby/code/branches/10.1: ./ java/client/org/apache/derby/client/am/ java/demo/simple/ java/engine/org/apache/derby/diag/ java/engine/org/apache/derby/iapi/jdbc/ java/engine/org/apache/derby/impl/load/ java/eng...
Date Fri, 01 Jul 2005 17:28:54 GMT
Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall Fri Jul  1 10:28:49 2005
@@ -1,2 +1,2 @@
-derbynet/netxaPositive.sql
+jdbcapi/xaSimplePositive.sql
 jdbcapi/xaStateTran.sql

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/storerecovery.runall
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/storerecovery.runall?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/storerecovery.runall (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/storerecovery.runall Fri Jul  1 10:28:49 2005
@@ -3,3 +3,7 @@
 store/LogChecksumRecovery1.java
 store/MaxLogNumber.java
 store/MaxLogNumberRecovery.java
+store/oc_rec1.java
+store/oc_rec2.java
+store/oc_rec3.java
+store/oc_rec4.java

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/copyfiles.ant Fri Jul  1 10:28:49 2005
@@ -7,9 +7,6 @@
 dataSourcePermissions_net_sed.properties
 default_app.properties
 default_derby.properties
-netxaPositive.sql
-netxaPositive_app.properties
-netxaPositive_sed.properties
 runtimeinfo_sed.properties
 sysinfo_sed.properties
 testij.sql

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/I18NImportExport.sql Fri Jul  1 10:28:49 2005
@@ -7,7 +7,7 @@
 insert into tab1 values(77.406, date('2000-10-19'),  'test row 5');
 insert into tab1 values(50.395, date('2000-11-29'),  'test row 6');
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'tab1' , 'extinout/tab1_fr.unl' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'TAB1' , 'extinout/tab1_fr.unl' , 
                                     null, null, 'UTF8') ;
 
 -- localized display is off
@@ -19,7 +19,7 @@
 drop table tab1;
 create table tab1( c1 decimal(5,3), c2 date, c3 char(20) );
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'tab1' , 'extinout/tab1_fr.unl' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'TAB1' , 'extinout/tab1_fr.unl' , 
                                     null, null, 'UTF8', 0) ;
 
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/i18n/UnicodeEscape_JP.sql Fri Jul  1 10:28:49 2005
@@ -17,5 +17,5 @@
 insert into jtest values(15,'15:35:35','sysmaster\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u4f5c\u6210\u306f\u5b8c\u4e86\u3057\u307e\u3057\u305f\u3002');
 insert into jtest values(16,'15:39:10','\u30c1\u30a7\u30c3\u30af\u30dd\u30a4\u30f3\u30c8\u304c\u5b8c\u4e86\u3057\u307e\u3057\u305f:\u7d99\u7d9a\u6642\u9593\u306f 8\u79d2\u3067\u3057\u305f');
 select * from jtest;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'jtest' , 'extout/jtest.unl' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'JTEST' , 'extout/jtest.unl' , 
                                     null, null,'EUC_JP') ;

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java Fri Jul  1 10:28:49 2005
@@ -177,8 +177,6 @@
 			xid = getXid(27, (byte) 21, (byte) 01);
 			xr.start(xid, XAResource.TMNOFLAGS);
 			conn1 = xac.getConnection();
-			System.out.println("This is a bug. Connection's holdability should have been CLOSE_CURSORS_AT_COMMIT since it is in the global transaction");
-			System.out.println("Have reported this on Derby dev-list");
 			System.out.println("CONNECTION(in xa transaction) HOLDABILITY " + (conn1.getHoldability() == ResultSet.HOLD_CURSORS_OVER_COMMIT));
 			System.out.println("Autocommit on Connection inside global transaction has been set correctly to " + conn1.getAutoCommit());
 			xr.end(xid, XAResource.TMSUCCESS);

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaAnotherTest.sql Fri Jul  1 10:28:49 2005
@@ -8,12 +8,6 @@
 xa_connect ;
 xa_start xa_noflags 0;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 drop table APP.foo;
 create table APP.foo (a int);
 insert into APP.foo values (0);
@@ -34,12 +28,6 @@
 -- global connection 1
 xa_start xa_noflags 1;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 insert into APP.foo values (1);
 xa_end xa_suspend 1;
 
@@ -128,12 +116,6 @@
 -- add couple more global transactions
 xa_start xa_noflags 6;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 insert into APP.foo values (6);
 xa_end xa_suspend 6;
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimpleNegative.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimpleNegative.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimpleNegative.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimpleNegative.sql Fri Jul  1 10:28:49 2005
@@ -11,12 +11,6 @@
 xa_start xa_noflags 1;
 
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 
 -- ERROR: cannot get connection again
 xa_getconnection;
@@ -79,12 +73,6 @@
 
 xa_start xa_noflags 2;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 
 insert into APP.negative values ('ok', 3);
 
@@ -117,12 +105,6 @@
 -- this is OK
 xa_start xa_join 2;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 
 -- ERROR: another dup 
 insert into APP.negative values ('rollback', 3);
@@ -178,12 +160,6 @@
 
 xa_start xa_noflags 3;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 select * from global_xactTable order by gxid, status, username, type;
 drop table foo;
 create table foo (a int);

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/xaSimplePositive.sql Fri Jul  1 10:28:49 2005
@@ -6,12 +6,6 @@
 xa_connect ;
 xa_start xa_noflags 0;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 drop table foo;
 create table foo (a int);
 insert into foo values (0);
@@ -31,12 +25,6 @@
 
 xa_start xa_noflags 1;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 insert into APP.foo values (1);
 xa_end xa_suspend 1;
 
@@ -111,12 +99,6 @@
 
 xa_start xa_resume 4;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 
 insert into APP.foo values (4);
 disconnect;
@@ -136,12 +118,6 @@
 
 xa_start xa_resume 5;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 insert into APP.foo values (5);
 xa_end xa_success 5;
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors1.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors1.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors1.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors1.sql Fri Jul  1 10:28:49 2005
@@ -25,18 +25,14 @@
 close c1;
 
 get scroll insensitive cursor c1 as 'select * from t1';
--- 0 is invalid value for absolute
 absolute 0 c1;
 close c1;
 get scroll insensitive cursor c1 as 'select * from t1';
--- relative is invalid when not positioned on a row
 relative 0 c1;
 close c1;
 get scroll insensitive cursor c1 as 'select * from t1';
--- relative is invalid when not positioned on a row
 relative 2 c1;
 close c1;
-
 
 -- positive
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors2.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors2.java?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors2.java (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors2.java Fri Jul  1 10:28:49 2005
@@ -613,6 +613,16 @@
 			System.out.println("expected to be before the 1st row");
 			passed = false;
 		}
+                if (rs.absolute(0))
+                {
+			System.out.println("absolute(0) expected to return false");
+			passed = false;
+                }
+		if (! rs.isBeforeFirst())
+		{
+			System.out.println("still expected to be before the 1st row");
+			passed = false;
+		}
 		// go to first row
 		if (! rs.first())
 		{
@@ -898,7 +908,6 @@
 			passed = false;
 		}
 		rs.close();
-		
 
 		return passed;
 	}
@@ -968,6 +977,11 @@
 			System.out.println("rs.next() expected to show result set is empty");
 			passed = false;
 		}
+		if (rs.previous())
+		{
+			System.out.println("rs.previous() expected to show result set is empty");
+			passed = false;
+		}
 		if (rs.isAfterLast())
 		{
 			System.out.println("isAfterLast() expected to return false on empty result set");
@@ -984,6 +998,42 @@
 			passed = false;
 		}
 
+		if (rs.relative(0))
+		{
+			System.out.println("relative(0) expected to return false on empty result set");
+			passed = false;
+		}
+
+		if (rs.relative(1))
+		{
+			System.out.println("relative(1) expected to return false on empty result set");
+			passed = false;
+		}
+
+		if (rs.relative(-1))
+		{
+			System.out.println("relative(-1) expected to return false on empty result set");
+			passed = false;
+		}
+
+		if (rs.absolute(0))
+		{
+			System.out.println("absolute(0) expected to return false on empty result set");
+			passed = false;
+		}
+		if (rs.absolute(1))
+		{
+			System.out.println("absolute(1) expected to return false on empty result set");
+			passed = false;
+		}
+
+		if (rs.absolute(-1))
+		{
+			System.out.println("absolute(-1) expected to return false on empty result set");
+			passed = false;
+		}
+
+
 		rs.close();
 		// End of empty result set tests
 
@@ -1000,19 +1050,6 @@
 		{
 			/* Check to be sure the exception is the one we expect */
 			passed = passed && checkException(sqle, "XJ062");
-		}
-
-		// absolute(0)
-		try
-		{
-			rs.absolute(0);
-			System.out.println("absolute(0) expected to fail");
-			passed = false;
-		}
-		catch (SQLException sqle)
-		{
-			/* Check to be sure the exception is the one we expect */
-			passed = passed && checkException(sqle, "X0X86");
 		}
 
 		s_i_r.close();

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/synonym.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/synonym.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/synonym.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/lang/synonym.sql Fri Jul  1 10:28:49 2005
@@ -45,6 +45,9 @@
 create synonym synForTemp for session.t1;
 create synonym synForTemp for session."T1";
 
+-- Synonyms can't be created in session schemas
+create synonym session.table1 for APP.table1;
+
 -- Creating a table or a view when a synonym of that name is present. Error.
 create synonym myTable for table1;
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java Fri Jul  1 10:28:49 2005
@@ -107,6 +107,22 @@
     }
 
     /**
+     * Simple wrapper to execute a sql string.
+     **/
+    public void executeQuery(
+    Connection  conn,
+    String      stmt_str,
+    boolean     commit_query)
+        throws SQLException
+    {
+        Statement stmt = conn.createStatement();
+        stmt.executeUpdate(stmt_str);
+        stmt.close();
+        if (commit_query)
+            conn.commit();
+    }
+
+    /**
      * Call consistency checker on the table.
      * <p>
      **/

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/OnlineCompressTest.java Fri Jul  1 10:28:49 2005
@@ -48,7 +48,7 @@
      * Utility test function to call the system procedure.
      *
      **/
-    private void callCompress(
+    protected void callCompress(
     Connection  conn,
     String      schemaName,
     String      tableName,
@@ -173,11 +173,12 @@
      *
 	 * @exception  StandardException  Standard exception policy.
      **/
-    private void createAndLoadTable(
+    protected void createAndLoadTable(
     Connection  conn,
     boolean     create_table,
     String      tblname,
-    int         num_rows)
+    int         num_rows,
+    int         start_value)
         throws SQLException
     {
         if (create_table)
@@ -209,14 +210,14 @@
         int row_count = 0;
         try
         {
-            for (;row_count < num_rows; row_count++)
+            for (int i = start_value; row_count < num_rows; row_count++, i++)
             {
-                insert_stmt.setInt(1, row_count);               // keycol
-                insert_stmt.setInt(2, row_count * 10);          // indcol1
-                insert_stmt.setInt(3, row_count * 100);         // indcol2
-                insert_stmt.setInt(4, -row_count);              // indcol3
-                insert_stmt.setString(5, data1_str);            // data1_data
-                insert_stmt.setString(6, data2_str);            // data2_data
+                insert_stmt.setInt(1, i);               // keycol
+                insert_stmt.setInt(2, i * 10);          // indcol1
+                insert_stmt.setInt(3, i * 100);         // indcol2
+                insert_stmt.setInt(4, -i);              // indcol3
+                insert_stmt.setString(5, data1_str);    // data1_data
+                insert_stmt.setString(6, data2_str);    // data2_data
 
                 insert_stmt.execute();
             }
@@ -384,19 +385,6 @@
         conn.commit();
     }
 
-    private void executeQuery(
-    Connection  conn,
-    String      stmt_str,
-    boolean     commit_query)
-        throws SQLException
-    {
-        Statement stmt = conn.createStatement();
-        stmt.executeUpdate(stmt_str);
-        stmt.close();
-        if (commit_query)
-            conn.commit();
-    }
-
     private void log_wrong_count(
     String  error_msg,
     String  table_name,
@@ -442,7 +430,7 @@
         if (long_table)
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
-            createAndLoadTable(conn, create_table, table_name, num_rows);
+            createAndLoadTable(conn, create_table, table_name, num_rows, 0);
 
         if (verbose)
             testProgress("Calling compress.");
@@ -525,7 +513,7 @@
         if (long_table)
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
-            createAndLoadTable(conn, create_table, table_name, num_rows);
+            createAndLoadTable(conn, create_table, table_name, num_rows, 0);
 
         if (verbose)
             testProgress("Calling compress.");
@@ -601,7 +589,7 @@
         if (long_table)
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
-            createAndLoadTable(conn, create_table, table_name, num_rows);
+            createAndLoadTable(conn, create_table, table_name, num_rows, 0);
 
         // dump_table(conn, schemaName, table_name, false);
 
@@ -728,7 +716,7 @@
         if (long_table)
             createAndLoadLongTable(conn, create_table, table_name, num_rows);
         else
-            createAndLoadTable(conn, create_table, table_name, num_rows);
+            createAndLoadTable(conn, create_table, table_name, num_rows, 0);
         conn.commit();
 
         // delete all rows, and NO commit.

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xaOffline1.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xaOffline1.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xaOffline1.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xaOffline1.sql Fri Jul  1 10:28:49 2005
@@ -7,12 +7,6 @@
 xa_connect ;
 xa_start xa_noflags 0;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 drop table foo;
 create table foo (a int);
 insert into foo values (0);
@@ -70,12 +64,6 @@
 
 xa_start xa_noflags 4;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 select * from global_xactTable where gxid is not null order by gxid;
 select * from lock_table order by tabname, type desc, mode, cnt, lockname;
 xa_recover xa_startrscan;

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/store/xab2354.sql Fri Jul  1 10:28:49 2005
@@ -2,12 +2,6 @@
 xa_connect;
 xa_start xa_noflags 1;
 xa_getconnection;
--- Global transactions can not have hold cursor over commit. And hence we need to make sure the holdability is false for all jdks
--- In jdk13 and lower, this Brokered Connection has its holdability false over commit so we are fine. 
--- In jdk14 and higher, this Brokered Connection has its holdability true over commit. In order to set it to false, we have NoHoldForConnection 
--- NoHoldForConnection uses setHoldability api on Connection to set the holdability to false. But this api exists only for jdk14 and higher
--- And that is why, in jkd13 master, we see an exception nosuchmethod 
-NoHoldForConnection;
 create table foo (a int);
 insert into foo values (1);
 xa_end xa_success 1;

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/iepnegativetests.sql Fri Jul  1 10:28:49 2005
@@ -4,13 +4,13 @@
 insert into iep.t1 values(100) , (101) , (102) , (103) , (104) , (105) , (106);
 --export error cases
 --export can not create file
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'nodir/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'nodir/t1.dat' , 
                                  null, null, null) ;
 --export table not found
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 'NOTABLE' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'NOTABLE' , 'extinout/t1.dat' , 
                                  null, null, null) ;
 ---export schema is not valid
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 'T1' , 'extinout/t1.dat' , 
                                  null, null, null) ;
 --export query is invalid (syntax error)
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select from t1', 
@@ -20,77 +20,77 @@
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from iep.t1', 
                                     'extinout/t1.dat' , null, null, 'NOSUCHCODESET') ;
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('XXXX', 'T1' , 'extinout/t1.dat' , 
                                  null, null, null) ;
 --export delimiter errror cases
 --period can not be used as character ot column delimiter
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, '.', null) ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  '.', null, null) ;
 
 --same delimter can not be used as character and column delimters
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  ';', ';', null) ;
 
 --space character can not be a delimiter
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  ' ', ';', null) ;
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, ' ', null) ;
 
 --if emtry strinng is passed actual value delimiter should be space
 --and the that should become a invalid delimiter 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  '', ';', null) ;
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, '', null) ;
 
 
 --more than one character passed to the delimiters get truncated to one
 --following one should give error because eventually '\' delimiter 
 --is used a both for char and col
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  '\a', '\', null) ;
 
 
 --DO A VALID EXPORT AND  IMPORT 
 set schema iep;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, null, 'utf-8') ;
 delete from t1 ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, null, null, 0) ;
 select * from t1;
 
 --import error cases
 --import can not find input file
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE('iep', 't1' , 'nodir/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE('IEP', 'T1' , 'nodir/t1.dat' , 
                                  null, null, null, 0) ;
 --import table not found
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 'NOTABLE' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'NOTABLE' , 'extinout/t1.dat' , 
                                  null, null, null, 0) ;
 --import schema is not valid
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('XXXX', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('XXXX', 'T1' , 'extinout/t1.dat' , 
                                  null, null, null, 0) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, null, 'INCORRECTCODESET', 0) ;
 
 --check import with invalid delimiter usage
 --if emtry strinng is passed actual value delimiter should be space
 --and the that should become a invalid delimiter 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  '', ';', null, 0) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  null, '', null, 0) ;
 
 --same delimter can not be used as character and column delimters
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't1' , 'extinout/t1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T1' , 'extinout/t1.dat' , 
                                  ';', ';', null, 1) ;
 
 
@@ -100,19 +100,19 @@
 insert into session.temp1 values(1) , (2) , (3) , (4) , (5) , (6);
 select * from session.temp1;
 --export to from a temporary table
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('session', 'temp1' , 'extinout/temp1.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('SESSION', 'TEMP1' , 'extinout/temp1.dat' , 
       
                            null, null, null) ;
 -- because temporary table has on commit preserve rows, commit issued by export will not delete data from the temp table.
 select * from session.temp1;
 --import back to a regualr table
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 'v1' , 'extinout/temp1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'V1' , 'extinout/temp1.dat' , 
                                  null, null, null, 0) ;
 select * from v1;
 commit;
 --import to a temp table should fail with a table not found errror
 declare global temporary table session.temp2(c1 int) not logged;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('session', 'temp2' , 'extinout/temp1.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('SESSION', 'TEMP2' , 'extinout/temp1.dat' , 
                                  null, null, null, 0) ;
 
 select * from session.temp2 ;
@@ -125,61 +125,61 @@
 insert into t3 values(2 , 3.5 , 8.6 , 'test strings');
 insert into t3 values(3 , 3.5 , 8.6 , 'test strings');
 insert into t3 values(4 , 3.5 , 8.6 , 'test strings');
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't3' , 'extinout/t3.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T3' , 'extinout/t3.dat' , 
                                  null, null, null) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 't3' , 'extinout/t3.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'T3' , 'extinout/t3.dat' , 
                                  null, null, null, 0) ;
 select * from t3;
 
 --import data column names are incorrect
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3, x4', null,
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'X1, X2, X3, X4', null,
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3', '1,2,3,4', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'X1, X2, X3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
 
 --import data insert column names count < column indexes does not match
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'c1, c2, c3', '1,2,3,4', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'C1, C2, C3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
 --import data column indexes count > insert columns count
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'c1, c2, c3,c4', '1,2', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'C1, C2, C3,C4', '1,2', 
                                  'extinout/t3.dat' , 
                                  null, null, null, 0) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , null, '11,22,12,24', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , null, '11,22,12,24', 
                                  'extinout/t3.dat' , 
 				 null, null, null, 0) ;
 
 
 --repeat the above type cases with empty file and minor variation to paramters
 delete from t3 ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 't3' , 'extinout/t3.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'T3' , 'extinout/t3.dat' , 
                                   ';', '^', 'utf-16') ;
 --import data column names are incorrect
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3, x4', null, 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'X1, X2, X3, X4', null, 
                                  'extinout/t3.dat' , 
                                  ';', '^', 'utf-16', 1) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'x1, x2, x3', '1,2,3,4', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'X1, X2, X3', '1,2,3,4', 
                                  'extinout/t3.dat' , 
 				    ';', '^', 'utf-16', 1) ;
 
 --import data insert column names count < column indexes does not match
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , 'c1, c2, c3', null, 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , 'C1, C2, C3', null, 
                                  'extinout/t3.dat' , 
 				    ';', '^', 'utf-16', 1) ;
 --import data column indexes count > insert columns count
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , null, '1,2', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , null, '1,2', 
                                  'extinout/t3.dat' , 
 				    ';', '^', 'utf-16', 1) ;
 
 
 --specify column indexes that are not there in the file that is being  imported
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 't3' , null, '11,22,12,24', 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'T3' , null, '11,22,12,24', 
                                  'extinout/t3.dat' , 
 				    ';', '^', 'utf-16', 1) ;
 
@@ -193,15 +193,15 @@
 create table ntype(a int , ct CLOB(1024));
 create table ntype1(bt BLOB(1024) , a int);
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('iep', 'ntype' , 'extinout/ntype.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('IEP', 'NTYPE' , 'extinout/ntype.dat' , 
                                  null, null, null) ;
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from iep.ntype1',
 				   'extinout/ntype.dat' , 
                                    null, null, null) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('iep', 'ntype' , 'extinout/ntype.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('IEP', 'NTYPE' , 'extinout/ntype.dat' , 
                                  null, null, null, 0) ;
-call SYSCS_UTIL.SYSCS_IMPORT_DATA('iep', 'ntype1' , null , null, 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('IEP', 'NTYPE1' , null , null, 
                                  'extinout/ntype.dat' , 
                                  null, null, null, 0) ;
 
@@ -219,7 +219,7 @@
 autocommit off;
 --following import should fail with lock time out
 call SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY('derby.locks.waitTimeout', '5');
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('iep', 'parent', 'extinout/parent.del',null, null, null,1);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('IEP', 'PARENT', 'extinout/parent.del',null, null, null,1);
 disconnect c1;
 disconnect c2;
 

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ieptests.sql Fri Jul  1 10:28:49 2005
@@ -9,10 +9,10 @@
 insert into ex_emp values(99, 'smith' , 'tennis"p,l,ayer"', 190.55) ;
 -- Perform Export:
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                  null, null, null) ;
 -- Perform Import
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'IMP_EMP' , 'extinout/emp.dat' , 
                                       null, null, null, 0) ;
 
 insert into ex_emp values(100, 'smith' , 'tennis"player"', 190.55) ;
@@ -31,10 +31,10 @@
 
 -- Perform Export:
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                  null, null, null) ;
 -- Perform Import
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'IMP_EMP' , 'extinout/emp.dat' , 
                                       null, null, null, 0) ;
 
 select * from ex_emp;
@@ -52,7 +52,7 @@
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from ex_emp where id < 105', 
                                     'extinout/emp.dat' , null, null, null) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'IMP_EMP' , 'extinout/emp.dat' , 
                                       null, null, null, 0) ;
 
 --checking query
@@ -68,7 +68,7 @@
 
 -- import them in to a with order different than in the table;
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,'name, salary, skills, id', null,
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'IMP_EMP' ,'NAME, SALARY, SKILLS, ID', null,
                                     'extinout/emp.dat', null, null, null, 1) ;
 --check query
 select count(*) from imp_emp, ex_emp
@@ -78,7 +78,7 @@
 
 
 -- do import replace into the table with table order but using column indexes
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,null, '4, 1, 3, 2',
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'IMP_EMP' ,null, '4, 1, 3, 2',
                                     'extinout/emp.dat', null, null, null, 1) ;
 
 --check query
@@ -88,7 +88,7 @@
       (ex_emp.skills is NULL and imp_emp.skills is NULL));
 
 --replace using insert column names and column indexes
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,'salary, id, skills, name', '2, 4, 3, 1',
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'IMP_EMP' ,'SALARY, ID, SKILLS, NAME', '2, 4, 3, 1',
                                     'extinout/emp.dat', null, null, null, 1) ;
 
 --check query
@@ -100,26 +100,26 @@
 
 ---testing with different delimiters
 -- single quote(') as character delimiter
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                     null, '''', null) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'IMP_EMP' , 'extinout/emp.dat' , 
                                     null, '''', null, 1) ;
 
 select * from imp_emp ;
 
 -- single quote(') as column delimiter
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                     '''',null, null) ;
 delete from imp_emp ;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'IMP_EMP' , 'extinout/emp.dat' , 
                                     '''', null, null, 0) ;
 select * from imp_emp;
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                  '*', '%', null) ;
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'EX_EMP' , 'extinout/emp.dat' , 
                                  '*', '%', null, 1) ;
 
 select * from imp_emp ;
@@ -135,9 +135,9 @@
 create table noncast(c1 double , c2 real ) ;
 insert into noncast values(1.5 , 6.7 ) ;
 insert into noncast values(2.5 , 8.999) ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP' , 'noncast' , 'extinout/noncast.dat'  , null , null , null) ;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'noncast' , 'extinout/noncast.dat'  , null , null , null , 0) ;
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'noncast', 'c2 , c1' , '2, 1' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP' , 'NONCAST' , 'extinout/noncast.dat'  , null , null , null) ;
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'NONCAST' , 'extinout/noncast.dat'  , null , null , null , 0) ;
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'NONCAST', 'C2 , C1' , '2, 1' , 
                                    'extinout/noncast.dat'  , null , null , null , 0) ;
 select * from noncast ;
 
@@ -150,9 +150,9 @@
 insert into ttypes values('2004-04-03' , '15:18:31' , '2004-09-09 11:14:11' );
 insert into ttypes values(null , null , null);
 
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ttypes' , 'extinout/ttypes.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'TTYPES' , 'extinout/ttypes.del' , 
                                  null, null, null) ;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ttypes' , 'extinout/ttypes.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'TTYPES' , 'extinout/ttypes.del' , 
                                  null, null, null, 0) ;
 
 select * from ttypes;
@@ -165,9 +165,9 @@
 create table t1(a int ) ;
 insert into t1 values(1) ;
 insert into t1 values(2) ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'T1' , 'extinout/t1.del' , 
                                  null, null, null) ;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/t1.del' , 
                                  null, null, null, 0) ;
 --above import should have committed , following rollback should be a noop.
 rollback;
@@ -175,14 +175,14 @@
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --file not found error should rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/nofile.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
 commit;
 select * from t1 ;
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --table not found error should issue a implicit rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'NOTABLE' , 'extinout/t1.del' , 
                                  null, null, null, 0) ;
 commit ;
 select * from t1 ;
@@ -190,12 +190,12 @@
 ---check commit/rollback with replace options using 
 insert into t1 values(1) ;
 insert into t1 values(2) ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'T1' , 'extinout/t1.del' , 
                                  null, null, null) ;
 --above export should have a commit.rollback below should be a noop
 rollback;
 select * from t1;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/t1.del' , 
                                  null, null, null, 1) ;
 --above import should have committed , following rollback should be a noop.
 rollback;
@@ -203,14 +203,14 @@
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --file not found error should rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/nofile.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extinout/nofile.del' , 
                                  null, null, null, 1) ;
 commit;
 select * from t1 ;
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --table not found error should issue a implicit rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'NOTABLE' , 'extinout/t1.del' , 
                                  null, null, null, 1) ;
 commit ;
 ---check IMPORT_DATA calls commit/rollback
@@ -219,9 +219,9 @@
 ---check commit/rollback with replace options using 
 insert into t1 values(1) ;
 insert into t1 values(2) ;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'T1' , 'extinout/t1.del' , 
                                  null, null, null) ;
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1' , 'a' , '1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1' , 'A' , '1' , 'extinout/t1.del' , 
                                  null, null, null, 0) ;
 --above import should have committed , following rollback should be a noop.
 rollback;
@@ -229,14 +229,14 @@
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --file not found error should rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1', 'a' , '1'  , 'extinout/nofile.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
 commit;
 select * from t1 ;
 insert into t1 values(3) ;
 insert into t1 values(4) ;
 --table not found error should issue a implicit rollback 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'notable' , 'a' , '1', 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'NOTABLE' , 'A' , '1', 'extinout/t1.del' , 
                                  null, null, null, 1) ;
 commit ;
 select * from t1 ;
@@ -245,18 +245,18 @@
 --make sure commit import code is ok in autcommit mode.
 insert into t1 values(3) ;
 insert into t1 values(4) ;
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1' , 'a' , '1' , 'extinout/t1.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1' , 'A' , '1' , 'extinout/t1.del' , 
                                  null, null, null, 0) ;
 select * from t1 ;
 insert into t1 values(5) ;
 insert into t1 values(6) ;
 --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' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T1', 'A' , '1'  , 'extinout/nofile.del' , 
                                  null, null, null, 0) ;
 select * from t1 ;
 --END IMPORT COMMIT/ROLLBACK TESTSING
 
----all types supported by DB2 cloudscape import/export
+---all types supported by Derby import/export
 create table alltypes(chartype char(20) , 
 	          biginttype bigint , 
 		  datetype date , 
@@ -309,9 +309,9 @@
                               '2004-09-09 11:14:11',
                               '"varchar" testing');
                               
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null) ;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null, 0) ;
 select * from alltypes ;                          
 delete from alltypes;
@@ -323,12 +323,12 @@
 for each  row mode db2sql
 insert into test1 values(newrow.chartype);
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null, 0) ;
 select count(*) from alltypes ;
 select * from test1;
 delete from alltypes;
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALLTYPES' , 'extinout/alltypes.del' , 
                                  null, null, null, 1) ;
 select count(*) from alltypes;
 
@@ -352,24 +352,24 @@
 
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select c1,c3,c4 from table2' , 'extinout/import.del' , 
                                  null, null, null) ;
-CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL,'table1', 'c1,c3,c4' , null, 'extinout/import.del',null, null,null,0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL,'TABLE1', 'C1,C3,C4' , null, 'extinout/import.del',null, null,null,0);
 
 select * from table1;
 delete from table1;
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'table2' , 'extinout/import.del',  null, null, null) ;
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'TABLE2' , 'extinout/import.del',  null, null, null) ;
 
 --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);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null, null,1);
 
 --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);
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL, 'TABLE1', 'C1,C3,C4' , '1,3,4', 'extinout/import.del',null, null, null,1);
 select * from table1;
 
 update table2 set c2=null;
 --check null values import to identity columns should also fail
-call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'table2' , 'extinout/import.del' , 
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'TABLE2' , 'extinout/import.del' , 
                                  null, null, null) ;
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'table1', 'extinout/import.del',null, null, null,1);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'TABLE1', 'extinout/import.del',null, null, null,1);
 select * from table1;
 
 --check that replace fails when there dependents and replaced data 
@@ -381,12 +381,12 @@
 call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from parent where a < 3' , 'extinout/parent.del' , 
                                  null, null, null) ;
 --replace should fail because of dependent table
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'parent', 'extinout/parent.del',null, null, null,1);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'PARENT', 'extinout/parent.del',null, null, null,1);
 select * from parent;
 
 ---test with a file which has a differen records seperators (\n, \r , \r\n)
 create table nt1( a int , b char(30));
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'nt1', 'extin/mixednl.del',null, null, null,0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'NT1', 'extin/mixednl.del',null, null, null,0);
 select * from nt1;
 drop table nt1 ;
 
@@ -400,14 +400,14 @@
        detail_description long varchar,
        web_flag varchar(1)
     );
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'position_info', 'extin/position_info.del',
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extin/position_info.del',
                                     null, null, null, 1);
 select count(*) from position_info ;
 select detail_description from position_info where position_code='AG1000';
-CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'position_info', 'extinout/pinfo.del',
+CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'POSITION_INFO', 'extinout/pinfo.del',
                                     null, null, null);
 delete from position_info;
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'position_info', 'extinout/pinfo.del',
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'POSITION_INFO', 'extinout/pinfo.del',
                                     null, null, null, 1);
 select count(*) from position_info ;
 select detail_description from position_info where position_code='AG1000';
@@ -420,9 +420,9 @@
 create table dest_always(i int generated always as identity);
 create table dest_by_default(i int generated by default as identity);
 
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','dest_always','extinout/autoinc.dat',null,null,null,0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,0);
 select * from dest_always;
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','dest_by_default','extinout/autoinc.dat',null,null,null,0);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_BY_DEFAULT','extinout/autoinc.dat',null,null,null,0);
 select * from dest_by_default;
 
 drop table dest_always;
@@ -432,11 +432,85 @@
 create table dest_always(i int generated always as identity);
 create table dest_by_default(i int generated by default as identity);
 
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','dest_always','extinout/autoinc.dat',null,null,null,1);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_ALWAYS','extinout/autoinc.dat',null,null,null,1);
 select * from dest_always;
-CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','dest_by_default','extinout/autoinc.dat',null,null,null,1);
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE('APP','DEST_BY_DEFAULT','extinout/autoinc.dat',null,null,null,1);
 select * from dest_by_default;
 
 drop table dest_always;
 drop table dest_by_default;
+--test case for bug (DERBY-390)
+--test import/export with reserved words as table Name, column Names ..etc.
+create schema "Group";
+create table "Group"."Order"("select" int, "delete" int, itemName char(20)) ;
+insert into "Group"."Order" values(1, 2, 'memory') ;
+insert into "Group"."Order" values(3, 4, 'disk') ;
+insert into "Group"."Order" values(5, 6, 'mouse') ;
+
+--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) ;
+--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) ;
+--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 ) ;
+--following exports should pass.
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('Group', 'Order' , 'extinout/order.dat', null, null, null) ;
+call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from "Group"."Order"' , 'extinout/order.dat' ,    null , null , null ) ;
+call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select "select" , "delete" , itemName from "Group"."Order"' , 
+                                                 'extinout/order.dat' ,    null , null , null ) ;
+
+--following import should fail because schema name is not matching the way it is defined using delimited quotes.
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('GROUP', 'Order' , 'extinout/order.dat', null, null, null, 0) ;
+--following import should fail because table name is not matching the way it is defined in the quotes.
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('Group', 'ORDER' , 'extinout/order.dat', null, null, null, 0) ;
+--following import should fail because table name is not matching the way it is defined in the quotes.
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'ORDER' , null , null ,   'extinout/order.dat'   , null , null , null, 1) ; 
+--following import should fail because column name is not matching the way it is defined in the quotes.
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'Order' , 'DELETE, ITEMNAME' , '2, 3' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+--following import should fail because undelimited column name is not in upper case.
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'Order' , 'delete, itemName' , '2, 3' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+
+--following imports should pass
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('Group', 'Order' , 'extinout/order.dat', null, null, null, 0) ;
+select * from "Group"."Order";
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'Order' , null , null ,   'extinout/order.dat'   , null , null , null, 1) ; 
+select * from "Group"."Order";
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'Order' , 'delete' , '2' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+select * from "Group"."Order";
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('Group', 'Order' , 'ITEMNAME, select, delete' , '3,2,1' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+select * from "Group"."Order";
+drop table "Group"."Order";
+
+---test undelimited names( All unquoted SQL identfiers should be passed in upper case). 
+create schema inventory;
+create table inventory.orderTable(id int, amount int, itemName char(20)) ;
+insert into inventory.orderTable values(101, 5, 'pizza') ;
+insert into inventory.orderTable values(102, 6, 'coke') ;
+insert into inventory.orderTable values(103, 7, 'break sticks') ;
+insert into inventory.orderTable values(104, 8, 'buffolo wings') ;
+
+--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) ;
+--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) ;
+
+--following export should pass.
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('INVENTORY', 'ORDERTABLE' , 'extinout/order.dat', null, null, null) ;
+
+--following import should fail because schema name is not in upper case
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('inventory', 'ORDERTABLE' , 'extinout/order.dat', null, null, null, 0) ;
+--following import should fail because table name is not in upper case.
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE ('INVENTORY', 'ordertable' , 'extinout/order.dat', null, null, null, 0) ;
+--following import should fail because table name is not in upper case .
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('INVENTORY', 'ordertable' , null , null ,   'extinout/order.dat'   , null , null , null, 1) ; 
+--following import should fail because column name is not in upper case.
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('INVENTORY', 'ORDERTABLE' , 'amount, ITEMNAME' , '2, 3' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+
+
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('INVENTORY', 'ORDERTABLE' , null , null ,   'extinout/order.dat'   , null , null , null, 1) ; 
+select * from inventory.orderTable;
+call SYSCS_UTIL.SYSCS_IMPORT_DATA('INVENTORY', 'ORDERTABLE' , 'ITEMNAME, ID, AMOUNT' , '3,2,1' ,   'extinout/order.dat'   , null , null , null, 1) ; 
+select * from inventory.orderTable;
 
+drop table inventory.orderTable;
+--end derby-390 related test cases.

Modified: incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql (original)
+++ incubator/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportThruIJ.sql Fri Jul  1 10:28:49 2005
@@ -123,7 +123,7 @@
 			Balance decimal(8,2));
 
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'Alt1' , 'extin/Alt1.asc' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT1' , 'extin/Alt1.asc' , 
                                       null, null, null, 0) ;
 
 
@@ -147,7 +147,7 @@
 
 
 
-call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'Alt3' , 'extin/Alt3.asc' , 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT3' , 'extin/Alt3.asc' , 
                                       null, null, null, 0) ;
 
 
@@ -185,7 +185,7 @@
 	email	varchar(80),
 	web	varchar(50));
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'sqlAnywhere1' ,
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE1' ,
                                   null , '1,2,3,4,5,7,8,9,10,11,12,13,14', 
 	 		          'extin/sqlAnywhere1.txt' , 
 				  '|', '''', 'ASCII', 0) ;
@@ -200,7 +200,7 @@
 	email varchar(40),
 	phone varchar(30));
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'sqlAnywhere2' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'SQLANYWHERE2' , 
 		                  null , '3, 4, 7, 5',
 			          'extin/sqlAnywhere2.txt' , 
 				  '|', '''', 'ASCII', 0) ;
@@ -230,7 +230,7 @@
 -- import it first with just LF as record seperator, we should be seeing 
 -- ^M's at the end of note field.
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'HouseHoldItem' , 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'HOUSEHOLDITEM' , 
 				  null , '2,3,4,5,6,7,8,11,14', 
 				  'extin/Access1.txt' , 
 				  null, null, null, 0) ;
@@ -252,7 +252,7 @@
                   column5 varchar(200),
                   column6 varchar(200));
 
-call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_temp' ,null, '2, 3, 4, 5, 6',
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'IMP_TEMP' ,null, '2, 3, 4, 5, 6',
                                     'extinout/t1.dump', '|', '''', 'ASCII', 0) ;
 
 select * from imp_temp ;

Modified: incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/utilMain.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/utilMain.java?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/utilMain.java (original)
+++ incubator/derby/code/branches/10.1/java/tools/org/apache/derby/impl/tools/ij/utilMain.java Fri Jul  1 10:28:49 2005
@@ -693,12 +693,7 @@
 			throw ijException.forwardOnlyCursor("ABSOLUTE");
 		}
 
-		// 0 is an invalid value for row
-		if (row == 0)
-		{
-			throw ijException.zeroInvalidForAbsolute();
-		}
-
+		// 0 is an *VALID* value for row
 		return new ijRowResult(rs, rs.absolute(row));
 	}
 

Modified: incubator/derby/code/branches/10.1/tools/javadoc/publishedapi.ant
URL: http://svn.apache.org/viewcvs/incubator/derby/code/branches/10.1/tools/javadoc/publishedapi.ant?rev=208776&r1=208775&r2=208776&view=diff
==============================================================================
--- incubator/derby/code/branches/10.1/tools/javadoc/publishedapi.ant (original)
+++ incubator/derby/code/branches/10.1/tools/javadoc/publishedapi.ant Fri Jul  1 10:28:49 2005
@@ -24,8 +24,14 @@
 
 # package: org.apache.derby.jdbc
 
+org/apache/derby/jdbc/ClientBaseDataSource.java
+org/apache/derby/jdbc/ClientConnectionPoolDataSource.java
+org/apache/derby/jdbc/ClientDataSource.java
+org/apache/derby/jdbc/ClientDriver.java
+org/apache/derby/jdbc/ClientXADataSource.java
 org/apache/derby/jdbc/EmbeddedConnectionPoolDataSource.java
 org/apache/derby/jdbc/EmbeddedDataSource.java
+org/apache/derby/jdbc/EmbeddedSimpleDataSource.java
 org/apache/derby/jdbc/EmbeddedDriver.java
 org/apache/derby/jdbc/EmbeddedXADataSource.java
 
@@ -33,4 +39,4 @@
 
 org/apache/derby/tools/ij.java
 org/apache/derby/tools/sysinfo.java
-org/apache/derby/tools/cslook.java
+org/apache/derby/tools/dblook.java



Mime
View raw message