Author: mcaisse
Date: Fri Dec 16 20:18:40 2005
New Revision: 357291
URL: http://svn.apache.org/viewcvs?rev=357291&view=rev
Log:
JDO-261
Modified:
incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-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/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
Fri Dec 16 20:18:40 2005
@@ -13,8 +13,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfObject2" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="HashSetOfObject2" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="HashSetOfSimpleClass3" >
@@ -25,8 +25,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfSimpleClass5" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="HashSetOfSimpleClass5" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="HashSetOfSimpleClass42" serialized="true">
@@ -41,9 +41,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfSimpleInterface8">
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
- serialized-element="true">
+<field name="HashSetOfSimpleInterface8" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" >
</collection>
</field>
<field name="HashSetOfString9" >
Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
Fri Dec 16 20:18:40 2005
@@ -13,8 +13,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfObject2" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="SetOfObject2" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfSimpleClass3" >
@@ -25,8 +25,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfSimpleClass5" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="SetOfSimpleClass5" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfSimpleClass42" serialized="true">
@@ -41,9 +41,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfSimpleInterface8">
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
- serialized-element="true">
+<field name="SetOfSimpleInterface8" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfString9" >
Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections.jdo
Fri Dec 16 20:18:40 2005
@@ -11,8 +11,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfObject2" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="HashSetOfObject2" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="HashSetOfSimpleClass3" >
@@ -23,8 +23,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfSimpleClass5" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="HashSetOfSimpleClass5" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="HashSetOfSimpleClass42" serialized="true">
@@ -39,9 +39,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="HashSetOfSimpleInterface8">
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
- serialized-element="true">
+<field name="HashSetOfSimpleInterface8" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="HashSetOfString9" >
Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections.jdo
Fri Dec 16 20:18:40 2005
@@ -11,8 +11,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfObject2" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="SetOfObject2" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfSimpleClass3" >
@@ -23,8 +23,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfSimpleClass5" >
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
+<field name="SetOfSimpleClass5" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfSimpleClass42" serialized="true">
@@ -39,9 +39,8 @@
<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="true">
</collection>
</field>
-<field name="SetOfSimpleInterface8">
- <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
- serialized-element="true">
+<field name="SetOfSimpleInterface8" serialized="true">
+ <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
</collection>
</field>
<field name="SetOfString9" >
Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
Fri Dec 16 20:18:40 2005
@@ -21,9 +21,7 @@
</element>
</field>
<field name="HashSetOfObject2"
- table="HASHSET_OF_OBJECT2">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_OBJECT2">
</field>
<field name="HashSetOfSimpleClass3"
table="HASHSET_OF_SIMPLE_CLASS3">
@@ -42,9 +40,7 @@
</element>
</field>
<field name="HashSetOfSimpleClass5"
- table="HASHSET_OF_SIMPLE_CLASS5">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_SIMPLE_CLASS5">
</field>
<field name="HashSetOfSimpleClass42"
column="HASHSET_OF_SIMPLE_CLASS42">
@@ -66,9 +62,7 @@
</element>
</field>
<field name="HashSetOfSimpleInterface8"
- table="HASHSET_OF_SIMPLE_INTERFACE8">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_SIMPLE_INTERFACE8">
</field>
<field name="HashSetOfString9"
table="HASHSET_OF_STRING9">
Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
Fri Dec 16 20:18:40 2005
@@ -21,9 +21,7 @@
</element>
</field>
<field name="SetOfObject2"
- table="SET_OF_OBJECT2">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_OBJECT2">
</field>
<field name="SetOfSimpleClass3"
table="SET_OF_SIMPLE_CLASS3">
@@ -42,9 +40,7 @@
</element>
</field>
<field name="SetOfSimpleClass5"
- table="SET_OF_SIMPLE_CLASS5">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_SIMPLE_CLASS5">
</field>
<field name="SetOfSimpleClass42"
column="SET_OF_SIMPLE_CLASS42">
@@ -66,9 +62,7 @@
</element>
</field>
<field name="SetOfSimpleInterface8"
- table="SET_OF_SIMPLE_INTERFACE8">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_SIMPLE_INTERFACE8">
</field>
<field name="SetOfString9"
table="SET_OF_STRING9">
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
Fri Dec 16 20:18:40 2005
@@ -27,9 +27,7 @@
</element>
</field>
<field name="HashSetOfObject2"
- table="HASHSET_OF_OBJECT2">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_OBJECT2">
</field>
<field name="HashSetOfSimpleClass3"
table="HASHSET_OF_SIMPLE_CLASS3">
@@ -53,9 +51,7 @@
</element>
</field>
<field name="HashSetOfSimpleClass5"
- table="HASHSET_OF_SIMPLE_CLASS5">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_SIMPLE_CLASS5">
</field>
<field name="HashSetOfSimpleClass42"
column="HASHSET_OF_SIMPLE_CLASS42">
@@ -82,9 +78,7 @@
</element>
</field>
<field name="HashSetOfSimpleInterface8"
- table="HASHSET_OF_SIMPLE_INTERFACE8">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="HASHSET_OF_SIMPLE_INTERFACE8">
</field>
<field name="HashSetOfString9"
table="HASHSET_OF_STRING9">
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
Fri Dec 16 20:18:40 2005
@@ -27,9 +27,7 @@
</element>
</field>
<field name="SetOfObject2"
- table="SET_OF_OBJECT2">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_OBJECT2">
</field>
<field name="SetOfSimpleClass3"
table="SET_OF_SIMPLE_CLASS3">
@@ -53,9 +51,7 @@
</element>
</field>
<field name="SetOfSimpleClass5"
- table="SET_OF_SIMPLE_CLASS5">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_SIMPLE_CLASS5">
</field>
<field name="SetOfSimpleClass42"
column="SET_OF_SIMPLE_CLASS42">
@@ -82,9 +78,7 @@
</element>
</field>
<field name="SetOfSimpleInterface8"
- table="SET_OF_SIMPLE_INTERFACE8">
- <join column="IDENTIFIER"/>
- <element column="COLLVAL"/>
+ column="SET_OF_SIMPLE_INTERFACE8">
</field>
<field name="SetOfString9"
table="SET_OF_STRING9">
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=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Fri Dec 16 20:18:40
2005
@@ -443,13 +443,10 @@
DROP TABLE SET_OF_OBJECT0;
DROP TABLE SET_OF_OBJECT1;
-DROP TABLE SET_OF_OBJECT2;
DROP TABLE SET_OF_SIMPLE_CLASS3;
DROP TABLE SET_OF_SIMPLE_CLASS4;
-DROP TABLE SET_OF_SIMPLE_CLASS5;
DROP TABLE SET_OF_SIMPLE_INTERFACE6;
DROP TABLE SET_OF_SIMPLE_INTERFACE7;
-DROP TABLE SET_OF_SIMPLE_INTERFACE8;
DROP TABLE SET_OF_STRING9;
DROP TABLE SET_OF_STRING10;
DROP TABLE SET_OF_DATE12;
@@ -476,13 +473,10 @@
DROP TABLE HASHSET_OF_OBJECT0;
DROP TABLE HASHSET_OF_OBJECT1;
-DROP TABLE HASHSET_OF_OBJECT2;
DROP TABLE HASHSET_OF_SIMPLE_CLASS3;
DROP TABLE HASHSET_OF_SIMPLE_CLASS4;
-DROP TABLE HASHSET_OF_SIMPLE_CLASS5;
DROP TABLE HASHSET_OF_SIMPLE_INTERFACE6;
DROP TABLE HASHSET_OF_SIMPLE_INTERFACE7;
-DROP TABLE HASHSET_OF_SIMPLE_INTERFACE8;
DROP TABLE HASHSET_OF_STRING9;
DROP TABLE HASHSET_OF_STRING10;
DROP TABLE HASHSET_OF_DATE12;
@@ -4518,6 +4512,9 @@
CREATE TABLE SET_COLLECTIONS
(
IDENTIFIER INTEGER NOT NULL,
+ SET_OF_OBJECT2 LONG VARCHAR FOR BIT DATA,
+ SET_OF_SIMPLE_CLASS5 LONG VARCHAR FOR BIT DATA,
+ SET_OF_SIMPLE_INTERFACE8 LONG VARCHAR FOR BIT DATA,
SET_OF_STRING11 LONG VARCHAR FOR BIT DATA,
SET_OF_DATE14 LONG VARCHAR FOR BIT DATA,
SET_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
@@ -4547,12 +4544,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_OBJECT2
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4567,12 +4558,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_SIMPLE_CLASS5
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4587,12 +4572,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_SIMPLE_INTERFACE8
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_STRING9
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4730,6 +4709,9 @@
CREATE TABLE HASHSET_COLLECTIONS
(
IDENTIFIER INTEGER NOT NULL,
+ HASHSET_OF_OBJECT2 LONG VARCHAR FOR BIT DATA,
+ HASHSET_OF_SIMPLE_CLASS5 LONG VARCHAR FOR BIT DATA,
+ HASHSET_OF_SIMPLE_INTERFACE8 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_STRING11 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_DATE14 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
@@ -4759,12 +4741,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE HASHSET_OF_OBJECT2
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
@@ -4779,12 +4755,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
@@ -4797,12 +4767,6 @@
ID BIGINT NOT NULL,
INTVAL INTEGER NOT NULL,
STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
);
CREATE TABLE HASHSET_OF_STRING9
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=357291&r1=357290&r2=357291&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Fri Dec 16 20:18:40
2005
@@ -403,13 +403,10 @@
DROP TABLE SET_OF_OBJECT0;
DROP TABLE SET_OF_OBJECT1;
-DROP TABLE SET_OF_OBJECT2;
DROP TABLE SET_OF_SIMPLE_CLASS3;
DROP TABLE SET_OF_SIMPLE_CLASS4;
-DROP TABLE SET_OF_SIMPLE_CLASS5;
DROP TABLE SET_OF_SIMPLE_INTERFACE6;
DROP TABLE SET_OF_SIMPLE_INTERFACE7;
-DROP TABLE SET_OF_SIMPLE_INTERFACE8;
DROP TABLE SET_OF_STRING9;
DROP TABLE SET_OF_STRING10;
DROP TABLE SET_OF_DATE12;
@@ -436,13 +433,10 @@
DROP TABLE HASHSET_OF_OBJECT0;
DROP TABLE HASHSET_OF_OBJECT1;
-DROP TABLE HASHSET_OF_OBJECT2;
DROP TABLE HASHSET_OF_SIMPLE_CLASS3;
DROP TABLE HASHSET_OF_SIMPLE_CLASS4;
-DROP TABLE HASHSET_OF_SIMPLE_CLASS5;
DROP TABLE HASHSET_OF_SIMPLE_INTERFACE6;
DROP TABLE HASHSET_OF_SIMPLE_INTERFACE7;
-DROP TABLE HASHSET_OF_SIMPLE_INTERFACE8;
DROP TABLE HASHSET_OF_STRING9;
DROP TABLE HASHSET_OF_STRING10;
DROP TABLE HASHSET_OF_DATE12;
@@ -4510,6 +4504,9 @@
(
DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
IDENTIFIER INTEGER,
+ SET_OF_OBJECT2 LONG VARCHAR FOR BIT DATA,
+ SET_OF_SIMPLE_CLASS5 LONG VARCHAR FOR BIT DATA,
+ SET_OF_SIMPLE_INTERFACE8 LONG VARCHAR FOR BIT DATA,
SET_OF_STRING11 LONG VARCHAR FOR BIT DATA,
SET_OF_DATE14 LONG VARCHAR FOR BIT DATA,
SET_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
@@ -4539,12 +4536,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_OBJECT2
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4559,12 +4550,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_SIMPLE_CLASS5
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4579,12 +4564,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE SET_OF_SIMPLE_INTERFACE8
-(
- IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE SET_OF_STRING9
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
@@ -4723,6 +4702,9 @@
(
DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
IDENTIFIER INTEGER,
+ HASHSET_OF_OBJECT2 LONG VARCHAR FOR BIT DATA,
+ HASHSET_OF_SIMPLE_CLASS5 LONG VARCHAR FOR BIT DATA,
+ HASHSET_OF_SIMPLE_INTERFACE8 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_STRING11 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_DATE14 LONG VARCHAR FOR BIT DATA,
HASHSET_OF_LOCALE17 LONG VARCHAR FOR BIT DATA,
@@ -4752,12 +4734,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE HASHSET_OF_OBJECT2
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
@@ -4772,12 +4748,6 @@
STRINGVAL VARCHAR(128) NOT NULL
);
-CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
-);
-
CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
@@ -4790,12 +4760,6 @@
ID BIGINT NOT NULL,
INTVAL INTEGER NOT NULL,
STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
-(
- IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
- COLLVAL LONG VARCHAR FOR BIT DATA
);
CREATE TABLE HASHSET_OF_STRING9
|