db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r391844 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/jvm.java master/Upgrade_10_1_10_2.out tests/upgradeTests/UpgradeTester.java tests/upgradeTests/Upgrade_10_1_10_2.java
Date Wed, 05 Apr 2006 23:20:51 GMT
Author: kmarsden
Date: Wed Apr  5 16:20:47 2006
New Revision: 391844

URL: http://svn.apache.org/viewcvs?rev=391844&view=rev
Log:
DERBY-514 Integrate upgrade tests into test suite
Contributed by Deepa Remesh.

Attaching a patch 'derby-514-patch2-runtest-v1.diff' which enables the upgrade test to run with the test harness.

Summary:

* findCodeBase method in harness/jvm.java is changed to public. This method is used by upgrade test to get the location of new jar files.

* Adds the other derby jars to the jar file list in UpgradeTester. This will allow the test to run in client framework. I tried running the test in client framework and it looks like this will need new master file and some more work.

* In UpgradeTester, File.toURL method is used when creating class loader. This seems to be a better way to construct the URL.

* Master file update

This patch combined with the previous patch (derby-514-buildfiles-v1.diff) will allow the upgrade test to be run using RunTest. The location of old jars has to be passed in as a property in jvmflags. Command to run:
java -Djvmflags=-DderbyTesting.oldJarLocation=<location of 10.1 jars> org.apache.derbyTesting.functionTests.harness.RunTest upgradeTests/Upgrade_10_1_10_2.java 
 

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java?rev=391844&r1=391843&r2=391844&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/jvm.java Wed Apr  5 16:20:47 2006
@@ -297,7 +297,7 @@
 		return wshome;
 	}
 
-	protected static String findCodeBase(boolean[] isJar)
+	public static String findCodeBase(boolean[] isJar)
 	{
 		String classpath = System.getProperty("java.class.path");
 		char sep = '/';

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out?rev=391844&r1=391843&r2=391844&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/Upgrade_10_1_10_2.out Wed Apr  5 16:20:47 2006
@@ -1,5 +1,3 @@
-
-
 START - phase CREATE
 complete caseVersionCheck - passed true
 complete caseReusableRecordIdSequenceNumber - passed true
@@ -24,7 +22,6 @@
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
-
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -38,7 +35,6 @@
 SYSIBM
 SYSPROC
 SYSSTAT
-
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 
@@ -403,11 +399,9 @@
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
-
 getCrossReference('','APP','reftab','',null,'reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -417,7 +411,6 @@
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getImportedKeys('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -427,7 +420,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,'louie','','APP',null):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -438,7 +430,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getExportedKeys('',null,'louie,'','APP',null ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -449,7 +440,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
@@ -613,9 +603,9 @@
 SQLSTATE(42X01): Syntax error: Encountered "QUARTER" at line 1, column 13.
 Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
 FAIL function works but not declared in list: SECOND
-Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts '1995-12-19 12:15:54'}) } --   = >1995-12-26 12:15:54.0<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
 FAIL function works but not declared in list: TIMESTAMPADD
-Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts '1995-12-19 12:15:54'}, {ts '1997-11-02 00:15:23'}) } --   = >683<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
 FAIL function works but not declared in list: TIMESTAMPDIFF
 Executing VALUES { fn WEEK({d '1995-12-19'}) } -- 
 SQLSTATE(42X01): Syntax error: Encountered "WEEK" at line 1, column 13.
@@ -643,57 +633,42 @@
 SETDEFAULT = 4
 getCrossReference('','APP','REFACTION1','','APP','REFACTIONNONE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105504340,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105504700,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105505020,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTCASCADE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105505480,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTSETNULL' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105505900,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105506230,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105506530,SQL051211105504060,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getImportedKeys - none update Passed
-
 getImportedKeys - none delete Passed
-
 getImportedKeys - delete Restrict Passed
-
 getImportedKeys - delete NO ACTION Passed
-
 getImportedKeys - delete CASCADE Passed
-
 getImportedKeys - delete SET NULL Passed
-
 getImportedKeys - update Restrict Passed
-
 getImportedKeys - update NO ACTION Passed
-
 getExportedKeys('',null,null,'','APP','REFACTION1' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105505480,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105505020,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105504340,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105504700,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105505900,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105506530,SQL051211105504060,7
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105506230,SQL051211105504060,7
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 ---------------------------------------
 getColumns for 'T1'
   Next line is real null.
@@ -709,8 +684,6 @@
 Test metadata finished
 Expected exception during shutdown: Database 'wombat' shutdown.
 END - PASS - phase CREATE
-
-
 START - phase SOFT UPGRADE
 complete caseVersionCheck - passed true
 caseReusableRecordIdSequenceNumber - Running compress
@@ -736,7 +709,6 @@
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
-
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -750,7 +722,6 @@
 SYSIBM
 SYSPROC
 SYSSTAT
-
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 
@@ -1115,11 +1086,9 @@
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
-
 getCrossReference('','APP','reftab','',null,'reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1129,7 +1098,6 @@
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getImportedKeys('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1139,7 +1107,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,'louie','','APP',null):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1150,7 +1117,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getExportedKeys('',null,'louie,'','APP',null ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1161,7 +1127,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
@@ -1280,8 +1245,8 @@
 Executing VALUES { fn MINUTE({t '16:13:03'}) } --   = >13<  << 
 Executing VALUES { fn MONTH({d '1995-12-19'}) } --   = >12<  << 
 Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
-Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts '1995-12-19 12:15:54'}) } --   = >1995-12-26 12:15:54.0<  << 
-Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts '1995-12-19 12:15:54'}, {ts '1997-11-02 00:15:23'}) } --   = >683<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
 Executing VALUES { fn YEAR({d '1995-12-19'}) } --   = >1995<  << 
 TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn DAYNAME({d '1995-12-19'h}) } -- 
@@ -1317,57 +1282,42 @@
 SETDEFAULT = 4
 getCrossReference('','APP','REFACTION1','','APP','REFACTIONNONE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105524870,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105525210,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105525510,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTCASCADE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105526030,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTSETNULL' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105526400,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105526890,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105527230,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getImportedKeys - none update Passed
-
 getImportedKeys - none delete Passed
-
 getImportedKeys - delete Restrict Passed
-
 getImportedKeys - delete NO ACTION Passed
-
 getImportedKeys - delete CASCADE Passed
-
 getImportedKeys - delete SET NULL Passed
-
 getImportedKeys - update Restrict Passed
-
 getImportedKeys - update NO ACTION Passed
-
 getExportedKeys('',null,null,'','APP','REFACTION1' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105526030,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105525510,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105524870,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105525210,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105526400,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105527230,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105526890,SQL051211105524470,7
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 ---------------------------------------
 getColumns for 'T1'
   Next line is real null.
@@ -1383,8 +1333,6 @@
 Test metadata finished
 Expected exception during shutdown: Database 'wombat' shutdown.
 END - PASS - phase SOFT UPGRADE
-
-
 START - phase POST SOFT UPGRADE
 complete caseVersionCheck - passed true
 complete caseReusableRecordIdSequenceNumber - passed true
@@ -1409,7 +1357,6 @@
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
-
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -1423,7 +1370,6 @@
 SYSIBM
 SYSPROC
 SYSSTAT
-
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 
@@ -1788,11 +1734,9 @@
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
-
 getCrossReference('','APP','reftab','',null,'reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1802,7 +1746,6 @@
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getImportedKeys('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1812,7 +1755,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,'louie','','APP',null):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1823,7 +1765,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getExportedKeys('',null,'louie,'','APP',null ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -1834,7 +1775,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
@@ -1998,9 +1938,9 @@
 SQLSTATE(42X01): Syntax error: Encountered "QUARTER" at line 1, column 13.
 Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
 FAIL function works but not declared in list: SECOND
-Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts '1995-12-19 12:15:54'}) } --   = >1995-12-26 12:15:54.0<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
 FAIL function works but not declared in list: TIMESTAMPADD
-Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts '1995-12-19 12:15:54'}, {ts '1997-11-02 00:15:23'}) } --   = >683<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
 FAIL function works but not declared in list: TIMESTAMPDIFF
 Executing VALUES { fn WEEK({d '1995-12-19'}) } -- 
 SQLSTATE(42X01): Syntax error: Encountered "WEEK" at line 1, column 13.
@@ -2028,57 +1968,42 @@
 SETDEFAULT = 4
 getCrossReference('','APP','REFACTION1','','APP','REFACTIONNONE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105550630,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105551130,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105551570,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTCASCADE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105551960,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTSETNULL' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105552390,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105553350,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105554360,SQL051211105550280,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getImportedKeys - none update Passed
-
 getImportedKeys - none delete Passed
-
 getImportedKeys - delete Restrict Passed
-
 getImportedKeys - delete NO ACTION Passed
-
 getImportedKeys - delete CASCADE Passed
-
 getImportedKeys - delete SET NULL Passed
-
 getImportedKeys - update Restrict Passed
-
 getImportedKeys - update NO ACTION Passed
-
 getExportedKeys('',null,null,'','APP','REFACTION1' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105551960,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105551570,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105550630,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105551130,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105552390,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105554360,SQL051211105550280,7
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105553350,SQL051211105550280,7
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 ---------------------------------------
 getColumns for 'T1'
   Next line is real null.
@@ -2094,8 +2019,6 @@
 Test metadata finished
 Expected exception during shutdown: Database 'wombat' shutdown.
 END - PASS - phase POST SOFT UPGRADE
-
-
 START - phase UPGRADE
 complete caseVersionCheck - passed true
 complete caseReusableRecordIdSequenceNumber - passed true
@@ -2120,7 +2043,6 @@
 DatabaseMetaData.getURL test passed
 allTablesAreSelectable(): true
 maxColumnNameLength(): 128
-
 getSchemas():
 TABLE_SCHEM[VARCHAR]
 APP
@@ -2134,7 +2056,6 @@
 SYSIBM
 SYSPROC
 SYSSTAT
-
 getCatalogs():
 TABLE_CAT[CHAR]
 getSearchStringEscape(): 
@@ -2507,11 +2428,9 @@
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
-
 getCrossReference('','APP','reftab','',null,'reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -2521,7 +2440,6 @@
 ,APP,LOUIE,C30,,APP,REFTAB,C30,1,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getImportedKeys('',null,null,'','APP','reftab' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -2531,7 +2449,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,S,,APP,REFTAB,S2,2,3,3,FKEY2,UNIQUEKEY,7
 ,APP,REFTAB,DPRIM,,APP,REFTAB,DFOR,1,3,3,FKEYSELF,PKEY_REFTAB,7
-
 getCrossReference('',null,'louie','','APP',null):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -2542,7 +2459,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getExportedKeys('',null,'louie,'','APP',null ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 ,APP,LOUIE,VC10,,APP,REFTAB,VC10,1,3,3,FKEY1,PRIMKEY,7
@@ -2553,7 +2469,6 @@
 ,APP,LOUIE,S,,APP,REFTAB,S,2,3,3,FKEY3,UNIQUEKEY,7
 ,APP,LOUIE,VC10,,APP,REFTAB2,T2_VC10,1,3,3,T2_FKEY1,PRIMKEY,7
 ,APP,LOUIE,I,,APP,REFTAB2,T2_I,2,3,3,T2_FKEY1,PRIMKEY,7
-
 getCrossReference('','badschema','LOUIE','','APP','REFTAB' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
 getTypeInfo():
@@ -2672,8 +2587,8 @@
 Executing VALUES { fn MINUTE({t '16:13:03'}) } --   = >13<  << 
 Executing VALUES { fn MONTH({d '1995-12-19'}) } --   = >12<  << 
 Executing VALUES { fn SECOND({t '16:13:03'}) } --   = >3<  << 
-Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts '1995-12-19 12:15:54'}) } --   = >1995-12-26 12:15:54.0<  << 
-Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts '1995-12-19 12:15:54'}, {ts '1997-11-02 00:15:23'}) } --   = >683<  << 
+Executing VALUES { fn TIMESTAMPADD(SQL_TSI_DAY, 7, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >xxxxxxFILTERED-TIMESTAMPxxxxx<  << 
+Executing VALUES { fn TIMESTAMPDIFF(SQL_TSI_DAY, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}, {ts 'xxxxxxFILTERED-TIMESTAMPxxxxx}) } --   = >683<  << 
 Executing VALUES { fn YEAR({d '1995-12-19'}) } --   = >1995<  << 
 TEST FUNCTIONS NOT DECLARED IN DATABASEMETADATA LIST
 Executing VALUES { fn DAYNAME({d '1995-12-19'h}) } -- 
@@ -2709,57 +2624,42 @@
 SETDEFAULT = 4
 getCrossReference('','APP','REFACTION1','','APP','REFACTIONNONE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105524870,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105525210,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105525510,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTCASCADE' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105526030,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTSETNULL' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105526400,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDRESTRICT' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105526890,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getCrossReference('','APP','REFACTION1','','APP','REFACTUPDNOACTION' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105527230,SQL051211105524470,7
-
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 getImportedKeys - none update Passed
-
 getImportedKeys - none delete Passed
-
 getImportedKeys - delete Restrict Passed
-
 getImportedKeys - delete NO ACTION Passed
-
 getImportedKeys - delete CASCADE Passed
-
 getImportedKeys - delete SET NULL Passed
-
 getImportedKeys - update Restrict Passed
-
 getImportedKeys - update NO ACTION Passed
-
 getExportedKeys('',null,null,'','APP','REFACTION1' ):
 PKTABLE_CAT[VARCHAR],PKTABLE_SCHEM[VARCHAR],PKTABLE_NAME[VARCHAR],PKCOLUMN_NAME[VARCHAR],FKTABLE_CAT[VARCHAR],FKTABLE_SCHEM[VARCHAR],FKTABLE_NAME[VARCHAR],FKCOLUMN_NAME[VARCHAR],KEY_SEQ[SMALLINT],UPDATE_RULE[SMALLINT],DELETE_RULE[SMALLINT],FK_NAME[VARCHAR],PK_NAME[VARCHAR],DEFERRABILITY[SMALLINT]
-,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,SQL051211105526030,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,SQL051211105525510,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,SQL051211105524870,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,SQL051211105525210,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,SQL051211105526400,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,SQL051211105527230,SQL051211105524470,7
-,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,SQL051211105526890,SQL051211105524470,7
+,APP,REFACTION1,A,,APP,REFACTCASCADE,A,1,3,0,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTNONE,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTRESTRICT,A,1,3,1,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTSETNULL,A,1,3,2,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDNOACTION,A,1,3,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
+,APP,REFACTION1,A,,APP,REFACTUPDRESTRICT,A,1,1,3,xxxxGENERATED-IDxxxx,xxxxGENERATED-IDxxxx,7
 ---------------------------------------
 getColumns for 'T1'
   Next line is real null.
@@ -2775,8 +2675,6 @@
 Test metadata finished
 Expected exception during shutdown: Database 'wombat' shutdown.
 END - PASS - phase UPGRADE
-
-
 START - phase POST UPGRADE
 Expected exception: Failed to start database with old version after hard upgrade
 END - PASS - phase POST UPGRADE

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java?rev=391844&r1=391843&r2=391844&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/UpgradeTester.java Wed Apr  5 16:20:47 2006
@@ -126,16 +126,15 @@
 	// Indicate if alpha/beta releases should support upgrade
 	private boolean allowPreReleaseUpgrade;
 	
-	// Currently, only derby.jar is specified. We can specify more jars, 
-	// as required.
-	private String[] jarFiles = new String [] {"derby.jar"};
+	// We can specify more jars, as required.
+	private String[] jarFiles = new String [] { "derby.jar", 
+												"derbynet.jar",
+												"derbyclient.jar",
+												"derbytools.jar"};
 	
 	// Test jar
 	private String testJar = "derbyTesting.jar";
 	
-	// Protocol used for classloader url
-	private final String urlProtocol = "file:";
-		
 	/**
 	 * Constructor
 	 * 
@@ -186,11 +185,11 @@
 		URL[] url = new URL[jarFiles.length + 1];
 		
 		for(int i=0; i < jarFiles.length; i++) {
-			url[i] = new URL(urlProtocol + jarLoc + File.separator + jarFiles[i]);
+			url[i] = new File(jarLoc + File.separator + jarFiles[i]).toURL();
 		}
 		
 		// Add derbyTesting.jar. Added from newer release
-		url[jarFiles.length] = new URL(urlProtocol + newJarLoc + File.separator + testJar);
+		url[jarFiles.length] = new File(newJarLoc + File.separator + testJar).toURL();
 		
 		// Specify null for parent class loader to avoid mixing up 
 		// jars specified in the system classpath
@@ -323,7 +322,7 @@
 		}
 		
 		try {
-			conn = getConnectionUsingReflection(classLoader, prop);
+			conn = getConnectionUsingDataSource(classLoader, prop);
 		} catch (SQLException sqle) {
 			if(phase != PH_POST_HARD_UPGRADE)
 				throw sqle;
@@ -352,7 +351,7 @@
 	 * @return
 	 * @throws Exception
 	 */
-	private Connection getConnectionUsingReflection(URLClassLoader classLoader, Properties prop) throws Exception{
+	private Connection getConnectionUsingDataSource(URLClassLoader classLoader, Properties prop) throws Exception{
 		Connection conn = null;
 		
 		Class testUtilClass = Class.forName("org.apache.derbyTesting.functionTests.util.TestUtil", 
@@ -641,7 +640,7 @@
 		prop.setProperty("connectionAttributes", "shutdown=true");
 		
 		try { 
-			getConnectionUsingReflection(classLoader, prop);
+			getConnectionUsingDataSource(classLoader, prop);
 		} catch (SQLException sqle) {
 			if(sqle.getSQLState().equals("08006")) {
 				System.out.println("Expected exception during shutdown: " 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java?rev=391844&r1=391843&r2=391844&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Upgrade_10_1_10_2.java Wed Apr  5 16:20:47 2006
@@ -22,6 +22,8 @@
 import java.net.MalformedURLException;
 import java.sql.SQLException;
 
+import org.apache.derbyTesting.functionTests.harness.jvm;
+
 /**
  * Test upgrade from 10.1 to 10.2 
  */
@@ -29,16 +31,9 @@
 
 	public static void main(String[] args) {
 		
-		// This test will use jar locations provided in command-line input till 
-		// the 10.1 jars are available in the repository (DERBY-1049)
-		if(args.length != 2) {
-			System.out.println("USAGE: java UpgradeTester_10_1_10_2 <location of old jars> <location of new jars>");
-			System.out.println("e.g: java UpgradeTester C:\\derby\\10.1\\lib C:\\derby\\trunk\\lib");
-			return;
-		}
-		
-		String oldJarLoc = args[0];
-		String newJarLoc = args[1];
+		String oldJarLoc = System.getProperty("derbyTesting.oldJarLocation");
+		boolean[] isJar = new boolean[1];
+		String newJarLoc = jvm.findCodeBase(isJar);
 		
 		int oldMajorVersion = 10;
 		int oldMinorVersion = 1;



Mime
View raw message