db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r233380 [2/2] - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/pc/fieldtypes/ jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/...
Date Thu, 18 Aug 2005 21:13:39 GMT
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
Thu Aug 18 14:13:19 2005
@@ -32,7 +32,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass109" column="SIMPLECLASS109">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID109"/>
+                    <field name="intField" column="INTFIELD109"/>
+                    <field name="stringField" column="STRINGFIELD109"/>
+                </embedded>
             </field>
             <field name="SimpleClass11" column="SIMPLECLASS11">
                 <foreign-key/>
@@ -77,7 +81,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass125" column="SIMPLECLASS125">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID125"/>
+                    <field name="intField" column="INTFIELD125"/>
+                    <field name="stringField" column="STRINGFIELD125"/>
+                </embedded>
             </field>
             <field name="SimpleClass126" column="SIMPLECLASS126">
                 <foreign-key/>
@@ -115,7 +123,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass17" column="SIMPLECLASS17">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID17"/>
+                    <field name="intField" column="INTFIELD17"/>
+                    <field name="stringField" column="STRINGFIELD17"/>
+                </embedded>
             </field>
             <field name="SimpleClass18" column="SIMPLECLASS18">
                 <foreign-key/>
@@ -153,7 +165,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass37" column="SIMPLECLASS37">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID37"/>
+                    <field name="intField" column="INTFIELD37"/>
+                    <field name="stringField" column="STRINGFIELD37"/>
+                </embedded>
             </field>
             <field name="SimpleClass38" column="SIMPLECLASS38">
                 <foreign-key/>
@@ -198,7 +214,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass53" column="SIMPLECLASS53">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID53"/>
+                    <field name="intField" column="INTFIELD53"/>
+                    <field name="stringField" column="STRINGFIELD53"/>
+                </embedded>
             </field>
             <field name="SimpleClass54" column="SIMPLECLASS54">
                 <foreign-key/>
@@ -236,7 +256,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass73" column="SIMPLECLASS73">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID73"/>
+                    <field name="intField" column="INTFIELD73"/>
+                    <field name="stringField" column="STRINGFIELD73"/>
+                </embedded>
             </field>
             <field name="SimpleClass74" column="SIMPLECLASS74">
                 <foreign-key/>
@@ -271,7 +295,11 @@
                 <foreign-key/>
             </field>
             <field name="SimpleClass89" column="SIMPLECLASS89">
-                <foreign-key/>
+                <embedded>
+                    <field name="id" column="ID89"/>
+                    <field name="intField" column="INTFIELD89"/>
+                    <field name="stringField" column="STRINGFIELD89"/>
+                </embedded>
             </field>
             <field name="SimpleClass90" column="SIMPLECLASS90">
                 <foreign-key/>

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Thu Aug 18 14:13:19
2005
@@ -2656,7 +2656,7 @@
     ID103 BIGINT, INTFIELD103 INTEGER, STRINGFIELD103 VARCHAR(1024),
     SIMPLECLASS104 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS108 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS109 BIGINT REFERENCES SIMPLE_CLASS,
+    ID109 BIGINT, INTFIELD109 INTEGER, STRINGFIELD109 VARCHAR(1024),
     SIMPLECLASS11 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS110 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS112 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2667,7 +2667,7 @@
     ID120 BIGINT, INTFIELD120 INTEGER, STRINGFIELD120 VARCHAR(1024),
     SIMPLECLASS121 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS124 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS125 BIGINT REFERENCES SIMPLE_CLASS,
+    ID125 BIGINT, INTFIELD125 INTEGER, STRINGFIELD125 VARCHAR(1024),
     SIMPLECLASS126 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS128 BIGINT REFERENCES SIMPLE_CLASS,
     ID129 BIGINT, INTFIELD129 INTEGER, STRINGFIELD129 VARCHAR(1024),
@@ -2677,7 +2677,7 @@
     ID139 BIGINT, INTFIELD139 INTEGER, STRINGFIELD139 VARCHAR(1024),
     SIMPLECLASS140 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS16 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS17 BIGINT REFERENCES SIMPLE_CLASS,
+    ID17 BIGINT, INTFIELD17 INTEGER, STRINGFIELD17 VARCHAR(1024),
     SIMPLECLASS18 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS2 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS20 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2687,7 +2687,7 @@
     ID31 BIGINT, INTFIELD31 INTEGER, STRINGFIELD31 VARCHAR(1024),
     SIMPLECLASS32 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS36 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS37 BIGINT REFERENCES SIMPLE_CLASS,
+    ID37 BIGINT, INTFIELD37 INTEGER, STRINGFIELD37 VARCHAR(1024),
     SIMPLECLASS38 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS4 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS40 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2698,7 +2698,7 @@
     SIMPLECLASS49 BIGINT REFERENCES SIMPLE_CLASS,
     ID5 BIGINT, INTFIELD5 INTEGER, STRINGFIELD5 VARCHAR(1024),
     SIMPLECLASS52 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS53 BIGINT REFERENCES SIMPLE_CLASS,
+    ID53 BIGINT, INTFIELD53 INTEGER, STRINGFIELD53 VARCHAR(1024),
     SIMPLECLASS54 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS56 BIGINT REFERENCES SIMPLE_CLASS,
     ID57 BIGINT, INTFIELD57 INTEGER, STRINGFIELD57 VARCHAR(1024),
@@ -2708,7 +2708,7 @@
     ID67 BIGINT, INTFIELD67 INTEGER, STRINGFIELD67 VARCHAR(1024),
     SIMPLECLASS68 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS72 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS73 BIGINT REFERENCES SIMPLE_CLASS,
+    ID73 BIGINT, INTFIELD73 INTEGER, STRINGFIELD73 VARCHAR(1024),
     SIMPLECLASS74 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS76 BIGINT REFERENCES SIMPLE_CLASS,
     ID77 BIGINT, INTFIELD77 INTEGER, STRINGFIELD77 VARCHAR(1024),
@@ -2717,7 +2717,7 @@
     ID84 BIGINT, INTFIELD84 INTEGER, STRINGFIELD84 VARCHAR(1024),
     SIMPLECLASS85 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS88 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS89 BIGINT REFERENCES SIMPLE_CLASS,
+    ID89 BIGINT, INTFIELD89 INTEGER, STRINGFIELD89 VARCHAR(1024),
     SIMPLECLASS90 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS92 BIGINT REFERENCES SIMPLE_CLASS,
     ID93 BIGINT, INTFIELD93 INTEGER, STRINGFIELD93 VARCHAR(1024),
@@ -2858,17 +2858,18 @@
 CREATE TABLE COLLECTION_COLLECTIONS
 (
     IDENTIFIER INTEGER NOT NULL,
-    COLLECTION_OF_STRING10 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_DATE13 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_LOCALE16 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BIG_DECIMAL19 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BIG_INTEGER22 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BYTE25 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_DOUBLE28 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_FLOAT31 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_INTEGER34 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_LONG37 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_SHORT40 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_STRING11 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_DATE14 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BIG_DECIMAL20 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BIG_INTEGER23 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BYTE26 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_DOUBLE29 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_FLOAT32 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_INTEGER35 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_LONG38 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_SHORT41 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_SIMPLE_CLASS42 LONG VARCHAR FOR BIT DATA,
     CONSTRAINT CC_PK PRIMARY KEY (IDENTIFIER)
 );
 
@@ -2881,49 +2882,55 @@
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_STRING9
@@ -2932,7 +2939,7 @@
     STRINGVAL VARCHAR(1024)
 );
 
-CREATE TABLE COLLECTION_OF_STRING11
+CREATE TABLE COLLECTION_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024)
@@ -2944,7 +2951,7 @@
     DATEVAL DATE
 );
 
-CREATE TABLE COLLECTION_OF_DATE14
+CREATE TABLE COLLECTION_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DATEVAL DATE
@@ -2956,7 +2963,7 @@
     LOCALEVAL CHAR(20)
 );
 
-CREATE TABLE COLLECTION_OF_LOCALE17
+CREATE TABLE COLLECTION_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20)
@@ -2968,7 +2975,7 @@
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
-CREATE TABLE COLLECTION_OF_BIG_DECIMAL20
+CREATE TABLE COLLECTION_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
@@ -2980,7 +2987,7 @@
     BIG_INTEGERVAL BIGINT
 );
 
-CREATE TABLE COLLECTION_OF_BIG_INTEGER23
+CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT
@@ -2992,7 +2999,7 @@
     BYTEVAL SMALLINT
 );
 
-CREATE TABLE COLLECTION_OF_BYTE26
+CREATE TABLE COLLECTION_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT
@@ -3004,7 +3011,7 @@
     DOUBLEVAL DOUBLE
 );
 
-CREATE TABLE COLLECTION_OF_DOUBLE29
+CREATE TABLE COLLECTION_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE
@@ -3016,7 +3023,7 @@
     FLOATVAL FLOAT
 );
 
-CREATE TABLE COLLECTION_OF_FLOAT32
+CREATE TABLE COLLECTION_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT
@@ -3028,7 +3035,7 @@
     INTEGERVAL INTEGER
 );
 
-CREATE TABLE COLLECTION_OF_INTEGER35
+CREATE TABLE COLLECTION_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER
@@ -3040,7 +3047,7 @@
     LONGVAL BIGINT
 );
 
-CREATE TABLE COLLECTION_OF_LONG38
+CREATE TABLE COLLECTION_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LONGVAL BIGINT
@@ -3052,7 +3059,7 @@
     SHORTVAL SMALLINT
 );
 
-CREATE TABLE COLLECTION_OF_SHORT41
+CREATE TABLE COLLECTION_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT
@@ -3337,42 +3344,42 @@
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -6890,7 +6897,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -6898,7 +6905,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=233380&r1=233379&r2=233380&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Thu Aug 18 14:13:19
2005
@@ -2629,7 +2629,7 @@
     ID103 BIGINT, INTFIELD103 INTEGER, STRINGFIELD103 VARCHAR(1024),
     SIMPLECLASS104 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS108 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS109 BIGINT REFERENCES SIMPLE_CLASS,
+    ID109 BIGINT, INTFIELD109 INTEGER, STRINGFIELD109 VARCHAR(1024),
     SIMPLECLASS11 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS110 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS112 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2640,7 +2640,7 @@
     ID120 BIGINT, INTFIELD120 INTEGER, STRINGFIELD120 VARCHAR(1024),
     SIMPLECLASS121 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS124 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS125 BIGINT REFERENCES SIMPLE_CLASS,
+    ID125 BIGINT, INTFIELD125 INTEGER, STRINGFIELD125 VARCHAR(1024),
     SIMPLECLASS126 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS128 BIGINT REFERENCES SIMPLE_CLASS,
     ID129 BIGINT, INTFIELD129 INTEGER, STRINGFIELD129 VARCHAR(1024),
@@ -2650,7 +2650,7 @@
     ID139 BIGINT, INTFIELD139 INTEGER, STRINGFIELD139 VARCHAR(1024),
     SIMPLECLASS140 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS16 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS17 BIGINT REFERENCES SIMPLE_CLASS,
+    ID17 BIGINT, INTFIELD17 INTEGER, STRINGFIELD17 VARCHAR(1024),
     SIMPLECLASS18 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS2 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS20 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2660,7 +2660,7 @@
     ID31 BIGINT, INTFIELD31 INTEGER, STRINGFIELD31 VARCHAR(1024),
     SIMPLECLASS32 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS36 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS37 BIGINT REFERENCES SIMPLE_CLASS,
+    ID37 BIGINT, INTFIELD37 INTEGER, STRINGFIELD37 VARCHAR(1024),
     SIMPLECLASS38 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS4 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS40 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2671,7 +2671,7 @@
     SIMPLECLASS49 BIGINT REFERENCES SIMPLE_CLASS,
     ID5 BIGINT, INTFIELD5 INTEGER, STRINGFIELD5 VARCHAR(1024),
     SIMPLECLASS52 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS53 BIGINT REFERENCES SIMPLE_CLASS,
+    ID53 BIGINT, INTFIELD53 INTEGER, STRINGFIELD53 VARCHAR(1024),
     SIMPLECLASS54 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS56 BIGINT REFERENCES SIMPLE_CLASS,
     ID57 BIGINT, INTFIELD57 INTEGER, STRINGFIELD57 VARCHAR(1024),
@@ -2681,7 +2681,7 @@
     ID67 BIGINT, INTFIELD67 INTEGER, STRINGFIELD67 VARCHAR(1024),
     SIMPLECLASS68 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS72 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS73 BIGINT REFERENCES SIMPLE_CLASS,
+    ID73 BIGINT, INTFIELD73 INTEGER, STRINGFIELD73 VARCHAR(1024),
     SIMPLECLASS74 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS76 BIGINT REFERENCES SIMPLE_CLASS,
     ID77 BIGINT, INTFIELD77 INTEGER, STRINGFIELD77 VARCHAR(1024),
@@ -2690,7 +2690,7 @@
     ID84 BIGINT, INTFIELD84 INTEGER, STRINGFIELD84 VARCHAR(1024),
     SIMPLECLASS85 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS88 BIGINT REFERENCES SIMPLE_CLASS,
-    SIMPLECLASS89 BIGINT REFERENCES SIMPLE_CLASS,
+    ID89 BIGINT, INTFIELD89 INTEGER, STRINGFIELD89 VARCHAR(1024),
     SIMPLECLASS90 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS92 BIGINT REFERENCES SIMPLE_CLASS,
     ID93 BIGINT, INTFIELD93 INTEGER, STRINGFIELD93 VARCHAR(1024),
@@ -2834,17 +2834,18 @@
 (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     IDENTIFIER INTEGER,
-    COLLECTION_OF_STRING10 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_DATE13 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_LOCALE16 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BIG_DECIMAL19 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BIG_INTEGER22 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_BYTE25 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_DOUBLE28 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_FLOAT31 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_INTEGER34 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_LONG37 LONG VARCHAR FOR BIT DATA,
-    COLLECTION_OF_SHORT40 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_STRING11 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_DATE14 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BIG_DECIMAL20 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BIG_INTEGER23 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_BYTE26 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_DOUBLE29 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_FLOAT32 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_INTEGER35 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_LONG38 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_SHORT41 LONG VARCHAR FOR BIT DATA,
+    COLLECTION_OF_SIMPLE_CLASS42 LONG VARCHAR FOR BIT DATA,
     CONSTRAINT CC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
@@ -2857,49 +2858,55 @@
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_STRING9
@@ -2908,7 +2915,7 @@
     STRINGVAL VARCHAR(1024)
 );
 
-CREATE TABLE COLLECTION_OF_STRING11
+CREATE TABLE COLLECTION_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024)
@@ -2920,7 +2927,7 @@
     DATEVAL DATE
 );
 
-CREATE TABLE COLLECTION_OF_DATE14
+CREATE TABLE COLLECTION_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DATEVAL DATE
@@ -2932,7 +2939,7 @@
     LOCALEVAL CHAR(20)
 );
 
-CREATE TABLE COLLECTION_OF_LOCALE17
+CREATE TABLE COLLECTION_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20)
@@ -2944,7 +2951,7 @@
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
-CREATE TABLE COLLECTION_OF_BIG_DECIMAL20
+CREATE TABLE COLLECTION_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
@@ -2956,7 +2963,7 @@
     BIG_INTEGERVAL BIGINT
 );
 
-CREATE TABLE COLLECTION_OF_BIG_INTEGER23
+CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT
@@ -2968,7 +2975,7 @@
     BYTEVAL SMALLINT
 );
 
-CREATE TABLE COLLECTION_OF_BYTE26
+CREATE TABLE COLLECTION_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT
@@ -2980,7 +2987,7 @@
     DOUBLEVAL DOUBLE
 );
 
-CREATE TABLE COLLECTION_OF_DOUBLE29
+CREATE TABLE COLLECTION_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE
@@ -2992,7 +2999,7 @@
     FLOATVAL FLOAT
 );
 
-CREATE TABLE COLLECTION_OF_FLOAT32
+CREATE TABLE COLLECTION_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT
@@ -3004,7 +3011,7 @@
     INTEGERVAL INTEGER
 );
 
-CREATE TABLE COLLECTION_OF_INTEGER35
+CREATE TABLE COLLECTION_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER
@@ -3016,7 +3023,7 @@
     LONGVAL BIGINT
 );
 
-CREATE TABLE COLLECTION_OF_LONG38
+CREATE TABLE COLLECTION_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LONGVAL BIGINT
@@ -3028,7 +3035,7 @@
     SHORTVAL SMALLINT
 );
 
-CREATE TABLE COLLECTION_OF_SHORT41
+CREATE TABLE COLLECTION_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT
@@ -3315,42 +3322,42 @@
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -6881,7 +6888,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
@@ -6889,7 +6896,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 



Mime
View raw message