db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r290851 - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date Wed, 21 Sep 2005 22:18:14 GMT
Author: mcaisse
Date: Wed Sep 21 15:18:06 2005
New Revision: 290851

URL: http://svn.apache.org/viewcvs?rev=290851&view=rev
Log:
JDO-122 step one: generalize use of <order> in mapping and schema of CollectionCollections

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=290851&r1=290850&r2=290851&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
Wed Sep 21 15:18:06 2005
@@ -8,6 +8,7 @@
                    table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfObject1"
                    table="COLLECTION_OF_OBJECT1">
@@ -25,11 +26,13 @@
                    table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass3"
                    table="COLLECTION_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass4"
                    table="COLLECTION_OF_SIMPLE_CLASS4">
@@ -47,6 +50,7 @@
                    table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass42"
                    column="COLLECTION_OF_SIMPLE_CLASS42">
@@ -55,6 +59,7 @@
                    table="COLLECTION_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleInterface7"
                    table="COLLECTION_OF_SIMPLE_INTERFACE7">
@@ -72,11 +77,13 @@
                    table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfString9"
                    table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfString11"
                    column="COLLECTION_OF_STRING11">
@@ -85,11 +92,13 @@
                    table="COLLECTION_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDate12"
                    table="COLLECTION_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDate14"
                    column="COLLECTION_OF_DATE14">
@@ -98,11 +107,13 @@
                    table="COLLECTION_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLocale15"
                    table="COLLECTION_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLocale17"
                    column="COLLECTION_OF_LOCALE17">
@@ -111,11 +122,13 @@
                    table="COLLECTION_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigDecimal18"
                    table="COLLECTION_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigDecimal20"
                    column="COLLECTION_OF_BIG_DECIMAL20">
@@ -124,11 +137,13 @@
                    table="COLLECTION_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigInteger21"
                    table="COLLECTION_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigInteger23"
                    column="COLLECTION_OF_BIG_INTEGER23">
@@ -137,11 +152,13 @@
                    table="COLLECTION_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfByte24"
                    table="COLLECTION_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfByte26"
                    column="COLLECTION_OF_BYTE26">
@@ -150,11 +167,13 @@
                    table="COLLECTION_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDouble27"
                    table="COLLECTION_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDouble29"
                    column="COLLECTION_OF_DOUBLE29">
@@ -163,11 +182,13 @@
                    table="COLLECTION_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfFloat30"
                    table="COLLECTION_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfFloat32"
                    column="COLLECTION_OF_FLOAT32">
@@ -176,11 +197,13 @@
                    table="COLLECTION_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfInteger33"
                    table="COLLECTION_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfInteger35"
                    column="COLLECTION_OF_INTEGER35">
@@ -189,11 +212,13 @@
                    table="COLLECTION_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLong36"
                    table="COLLECTION_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLong38"
                    column="COLLECTION_OF_LONG38">
@@ -202,11 +227,13 @@
                    table="COLLECTION_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfShort39"
                    table="COLLECTION_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfShort41"
                    column="COLLECTION_OF_SHORT41">
@@ -215,6 +242,7 @@
                    table="COLLECTION_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=290851&r1=290850&r2=290851&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
Wed Sep 21 15:18:06 2005
@@ -9,6 +9,7 @@
                    table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfObject1"
                    table="COLLECTION_OF_OBJECT1">
@@ -26,11 +27,13 @@
                    table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass3"
                    table="COLLECTION_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass4"
                    table="COLLECTION_OF_SIMPLE_CLASS4">
@@ -48,6 +51,7 @@
                    table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass42"
                    column="COLLECTION_OF_SIMPLE_CLASS42">
@@ -56,6 +60,7 @@
                    table="COLLECTION_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleInterface7"
                    table="COLLECTION_OF_SIMPLE_INTERFACE7">
@@ -73,11 +78,13 @@
                    table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="COLLVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfString9"
                    table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfString11"
                    column="COLLECTION_OF_STRING11">
@@ -86,11 +93,13 @@
                    table="COLLECTION_OF_STRING10">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDate12"
                    table="COLLECTION_OF_DATE12">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDate14"
                    column="COLLECTION_OF_DATE14">
@@ -99,11 +108,13 @@
                    table="COLLECTION_OF_DATE13">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLocale15"
                    table="COLLECTION_OF_LOCALE15">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLocale17"
                    column="COLLECTION_OF_LOCALE17">
@@ -112,11 +123,13 @@
                    table="COLLECTION_OF_LOCALE16">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigDecimal18"
                    table="COLLECTION_OF_BIG_DECIMAL18">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigDecimal20"
                    column="COLLECTION_OF_BIG_DECIMAL20">
@@ -125,11 +138,13 @@
                    table="COLLECTION_OF_BIG_DECIMAL19">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigInteger21"
                    table="COLLECTION_OF_BIG_INTEGER21">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfBigInteger23"
                    column="COLLECTION_OF_BIG_INTEGER23">
@@ -138,11 +153,13 @@
                    table="COLLECTION_OF_BIG_INTEGER22">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfByte24"
                    table="COLLECTION_OF_BYTE24">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfByte26"
                    column="COLLECTION_OF_BYTE26">
@@ -151,11 +168,13 @@
                    table="COLLECTION_OF_BYTE25">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDouble27"
                    table="COLLECTION_OF_DOUBLE27">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfDouble29"
                    column="COLLECTION_OF_DOUBLE29">
@@ -164,11 +183,13 @@
                    table="COLLECTION_OF_DOUBLE28">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfFloat30"
                    table="COLLECTION_OF_FLOAT30">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfFloat32"
                    column="COLLECTION_OF_FLOAT32">
@@ -177,11 +198,13 @@
                    table="COLLECTION_OF_FLOAT31">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfInteger33"
                    table="COLLECTION_OF_INTEGER33">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfInteger35"
                    column="COLLECTION_OF_INTEGER35">
@@ -190,11 +213,13 @@
                    table="COLLECTION_OF_INTEGER34">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLong36"
                    table="COLLECTION_OF_LONG36">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfLong38"
                    column="COLLECTION_OF_LONG38">
@@ -203,11 +228,13 @@
                    table="COLLECTION_OF_LONG37">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfShort39"
                    table="COLLECTION_OF_SHORT39">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfShort41"
                    column="COLLECTION_OF_SHORT41">
@@ -216,6 +243,7 @@
                    table="COLLECTION_OF_SHORT40">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
         </class>
     </package>

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=290851&r1=290850&r2=290851&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Wed Sep 21 15:18:06
2005
@@ -2876,6 +2876,7 @@
 CREATE TABLE COLLECTION_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2891,12 +2892,14 @@
 CREATE TABLE COLLECTION_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2912,12 +2915,14 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2933,138 +2938,161 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 

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=290851&r1=290850&r2=290851&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Wed Sep 21 15:18:06
2005
@@ -2860,6 +2860,7 @@
 CREATE TABLE COLLECTION_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2875,12 +2876,14 @@
 CREATE TABLE COLLECTION_OF_OBJECT2
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2896,12 +2899,14 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
@@ -2917,138 +2922,161 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
 	COLLVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_STRING9
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_STRING10
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_DATE12
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_DATE13
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE15
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE16
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL18
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL19
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_DECIMALVAL DECIMAL(17,6)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE24
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE25
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE27
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE28
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT30
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT31
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER33
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER34
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_LONG36
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_LONG37
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT39
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT40
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     SHORTVAL SMALLINT
 );
 



Mime
View raw message