You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/10/10 22:35:15 UTC
svn commit: r312732 [3/5] - in /incubator/jdo/trunk/tck20/test:
java/org/apache/jdo/tck/models/fieldtypes/
java/org/apache/jdo/tck/pc/fieldtypes/
jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
jdo/datastoreidentity/org/apache/jdo/tck/pc/fiel...
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=312732&r1=312731&r2=312732&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 Mon Oct 10 13:35:04 2005
@@ -5,163 +5,245 @@
<class name="HashSetCollections" table="HASHSET_COLLECTIONS">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="HashSetOfObject0" table="HASHSET_OF_OBJECT0">
+ <field name="HashSetOfObject0"
+ table="HASHSET_OF_OBJECT0">
<join column="IDENTIFIER"/>
<element column="OBJREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfObject1" table="HASHSET_OF_OBJECT1">
+ <field name="HashSetOfObject1"
+ table="HASHSET_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfObject2" table="HASHSET_OF_OBJECT2">
+ <field name="HashSetOfObject2"
+ table="HASHSET_OF_OBJECT2">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfSimpleClass3" table="HASHSET_OF_SIMPLE_CLASS3">
+ <field name="HashSetOfSimpleClass3"
+ table="HASHSET_OF_SIMPLE_CLASS3">
<join column="IDENTIFIER"/>
<element column="SIMPCLSREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfSimpleClass4" table="HASHSET_OF_SIMPLE_CLASS4">
+ <field name="HashSetOfSimpleClass4"
+ table="HASHSET_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- </field>
- <field name="HashSetOfSimpleClass5" table="HASHSET_OF_SIMPLE_CLASS5">
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="HashSetOfSimpleClass5"
+ table="HASHSET_OF_SIMPLE_CLASS5">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfSimpleInterface6" table="HASHSET_OF_SIMPLE_INTERFACE6">
+ <field name="HashSetOfSimpleClass42"
+ column="HASHSET_OF_SIMPLE_CLASS42">
+ </field>
+ <field name="HashSetOfSimpleInterface6"
+ table="HASHSET_OF_SIMPLE_INTERFACE6">
<join column="IDENTIFIER"/>
<element column="SIMPINTREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfSimpleInterface7" table="HASHSET_OF_SIMPLE_INTERFACE7">
+ <field name="HashSetOfSimpleInterface7"
+ table="HASHSET_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfSimpleInterface8" table="HASHSET_OF_SIMPLE_INTERFACE8">
+ <field name="HashSetOfSimpleInterface8"
+ table="HASHSET_OF_SIMPLE_INTERFACE8">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfString9" table="HASHSET_OF_STRING9">
+ <field name="HashSetOfString9"
+ table="HASHSET_OF_STRING9">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfString10"
- column="HASHSET_OF_STRING10"
- >
+ <field name="HashSetOfString11"
+ column="HASHSET_OF_STRING11">
</field>
- <field name="HashSetOfString11" table="HASHSET_OF_STRING11">
+ <field name="HashSetOfString10"
+ table="HASHSET_OF_STRING10">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfDate12" table="HASHSET_OF_DATE12">
+ <field name="HashSetOfDate12"
+ table="HASHSET_OF_DATE12">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfDate13" column="HASHSET_OF_DATE13"
- >
+ <field name="HashSetOfDate14"
+ column="HASHSET_OF_DATE14">
</field>
- <field name="HashSetOfDate14" table="HASHSET_OF_DATE14">
+ <field name="HashSetOfDate13"
+ table="HASHSET_OF_DATE13">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfLocale15" table="HASHSET_OF_LOCALE15">
+ <field name="HashSetOfLocale15"
+ table="HASHSET_OF_LOCALE15">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfLocale16" column="HASHSET_OF_LOCALE16"
- >
+ <field name="HashSetOfLocale17"
+ column="HASHSET_OF_LOCALE17">
</field>
- <field name="HashSetOfLocale17" table="HASHSET_OF_LOCALE17">
+ <field name="HashSetOfLocale16"
+ table="HASHSET_OF_LOCALE16">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfBigDecimal18" table="HASHSET_OF_BIG_DECIMAL18">
+ <field name="HashSetOfBigDecimal18"
+ table="HASHSET_OF_BIG_DECIMAL18">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfBigDecimal19" column="HASHSET_OF_BIG_DECIMAL19"
- >
+ <field name="HashSetOfBigDecimal20"
+ column="HASHSET_OF_BIG_DECIMAL20">
</field>
- <field name="HashSetOfBigDecimal20" table="HASHSET_OF_BIG_DECIMAL20">
+ <field name="HashSetOfBigDecimal19"
+ table="HASHSET_OF_BIG_DECIMAL19">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfBigInteger21" table="HASHSET_OF_BIG_INTEGER21">
+ <field name="HashSetOfBigInteger21"
+ table="HASHSET_OF_BIG_INTEGER21">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfBigInteger22" column="HASHSET_OF_BIG_INTEGER22"
- >
+ <field name="HashSetOfBigInteger23"
+ column="HASHSET_OF_BIG_INTEGER23">
</field>
- <field name="HashSetOfBigInteger23" table="HASHSET_OF_BIG_INTEGER23">
+ <field name="HashSetOfBigInteger22"
+ table="HASHSET_OF_BIG_INTEGER22">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfByte24" table="HASHSET_OF_BYTE24">
+ <field name="HashSetOfByte24"
+ table="HASHSET_OF_BYTE24">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfByte25" column="HASHSET_OF_BYTE25"
- >
+ <field name="HashSetOfByte26"
+ column="HASHSET_OF_BYTE26">
</field>
- <field name="HashSetOfByte26" table="HASHSET_OF_BYTE26">
+ <field name="HashSetOfByte25"
+ table="HASHSET_OF_BYTE25">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfDouble27" table="HASHSET_OF_DOUBLE27">
+ <field name="HashSetOfDouble27"
+ table="HASHSET_OF_DOUBLE27">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfDouble28" column="HASHSET_OF_DOUBLE28"
- >
+ <field name="HashSetOfDouble29"
+ column="HASHSET_OF_DOUBLE29">
</field>
- <field name="HashSetOfDouble29" table="HASHSET_OF_DOUBLE29">
+ <field name="HashSetOfDouble28"
+ table="HASHSET_OF_DOUBLE28">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfFloat30" table="HASHSET_OF_FLOAT30">
+ <field name="HashSetOfFloat30"
+ table="HASHSET_OF_FLOAT30">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfFloat31" column="HASHSET_OF_FLOAT31"
- >
+ <field name="HashSetOfFloat32"
+ column="HASHSET_OF_FLOAT32">
</field>
- <field name="HashSetOfFloat32" table="HASHSET_OF_FLOAT32">
+ <field name="HashSetOfFloat31"
+ table="HASHSET_OF_FLOAT31">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfInteger33" table="HASHSET_OF_INTEGER33">
+ <field name="HashSetOfInteger33"
+ table="HASHSET_OF_INTEGER33">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfInteger34" column="HASHSET_OF_INTEGER34"
- >
+ <field name="HashSetOfInteger35"
+ column="HASHSET_OF_INTEGER35">
</field>
- <field name="HashSetOfInteger35" table="HASHSET_OF_INTEGER35">
+ <field name="HashSetOfInteger34"
+ table="HASHSET_OF_INTEGER34">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfLong36" table="HASHSET_OF_LONG36">
+ <field name="HashSetOfLong36"
+ table="HASHSET_OF_LONG36">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfLong37" column="HASHSET_OF_LONG37"
- >
+ <field name="HashSetOfLong38"
+ column="HASHSET_OF_LONG38">
</field>
- <field name="HashSetOfLong38" table="HASHSET_OF_LONG38">
+ <field name="HashSetOfLong37"
+ table="HASHSET_OF_LONG37">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfShort39" table="HASHSET_OF_SHORT39">
+ <field name="HashSetOfShort39"
+ table="HASHSET_OF_SHORT39">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="HashSetOfShort40" column="HASHSET_OF_SHORT40"
- >
+ <field name="HashSetOfShort41"
+ column="HASHSET_OF_SHORT41">
</field>
- <field name="HashSetOfShort41" table="HASHSET_OF_SHORT41">
+ <field name="HashSetOfShort40"
+ table="HASHSET_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/LinkedListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/LinkedListCollections-derby.orm Mon Oct 10 13:35:04 2005
@@ -5,193 +5,245 @@
<class name="LinkedListCollections" table="LINKEDLIST_COLLECTIONS">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="LinkedListOfObject0" table="LINKEDLIST_OF_OBJECT0">
+ <field name="LinkedListOfObject0"
+ table="LINKEDLIST_OF_OBJECT0">
<join column="IDENTIFIER"/>
<element column="OBJREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfObject1" table="LINKEDLIST_OF_OBJECT1">
+ <field name="LinkedListOfObject1"
+ table="LINKEDLIST_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfObject2" table="LINKEDLIST_OF_OBJECT2">
+ <field name="LinkedListOfObject2"
+ table="LINKEDLIST_OF_OBJECT2">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfSimpleClass3" table="LINKEDLIST_OF_SIMPLE_CLASS3">
+ <field name="LinkedListOfSimpleClass3"
+ table="LINKEDLIST_OF_SIMPLE_CLASS3">
<join column="IDENTIFIER"/>
<element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfSimpleClass4" table="LINKEDLIST_OF_SIMPLE_CLASS4">
+ <field name="LinkedListOfSimpleClass4"
+ table="LINKEDLIST_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
- </field>
- <field name="LinkedListOfSimpleClass5" table="LINKEDLIST_OF_SIMPLE_CLASS5">
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="LinkedListOfSimpleClass5"
+ table="LINKEDLIST_OF_SIMPLE_CLASS5">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="LinkedListOfSimpleClass42"
+ column="LINKEDLIST_OF_SIMPLE_CLASS42">
</field>
- <field name="LinkedListOfSimpleInterface6" table="LINKEDLIST_OF_SIMPLE_INTERFACE6">
+ <field name="LinkedListOfSimpleInterface6"
+ table="LINKEDLIST_OF_SIMPLE_INTERFACE6">
<join column="IDENTIFIER"/>
<element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfSimpleInterface7" table="LINKEDLIST_OF_SIMPLE_INTERFACE7">
+ <field name="LinkedListOfSimpleInterface7"
+ table="LINKEDLIST_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfSimpleInterface8" table="LINKEDLIST_OF_SIMPLE_INTERFACE8">
+ <field name="LinkedListOfSimpleInterface8"
+ table="LINKEDLIST_OF_SIMPLE_INTERFACE8">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfString9" table="LINKEDLIST_OF_STRING9">
+ <field name="LinkedListOfString9"
+ table="LINKEDLIST_OF_STRING9">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfString10" column="LINKEDLIST_OF_STRING10"
- >
+ <field name="LinkedListOfString11"
+ column="LINKEDLIST_OF_STRING11">
</field>
- <field name="LinkedListOfString11" table="LINKEDLIST_OF_STRING11">
+ <field name="LinkedListOfString10"
+ table="LINKEDLIST_OF_STRING10">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfDate12" table="LINKEDLIST_OF_DATE12">
+ <field name="LinkedListOfDate12"
+ table="LINKEDLIST_OF_DATE12">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfDate13" column="LINKEDLIST_OF_DATE13"
- >
+ <field name="LinkedListOfDate14"
+ column="LINKEDLIST_OF_DATE14">
</field>
- <field name="LinkedListOfDate14" table="LINKEDLIST_OF_DATE14">
+ <field name="LinkedListOfDate13"
+ table="LINKEDLIST_OF_DATE13">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfLocale15" table="LINKEDLIST_OF_LOCALE15">
+ <field name="LinkedListOfLocale15"
+ table="LINKEDLIST_OF_LOCALE15">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfLocale16" column="LINKEDLIST_OF_LOCALE16"
- >
+ <field name="LinkedListOfLocale17"
+ column="LINKEDLIST_OF_LOCALE17">
</field>
- <field name="LinkedListOfLocale17" table="LINKEDLIST_OF_LOCALE17">
+ <field name="LinkedListOfLocale16"
+ table="LINKEDLIST_OF_LOCALE16">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfBigDecimal18" table="LINKEDLIST_OF_BIG_DECIMAL18">
+ <field name="LinkedListOfBigDecimal18"
+ table="LINKEDLIST_OF_BIG_DECIMAL18">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfBigDecimal19" column="LINKEDLIST_OF_BIG_DECIMAL19"
- >
+ <field name="LinkedListOfBigDecimal20"
+ column="LINKEDLIST_OF_BIG_DECIMAL20">
</field>
- <field name="LinkedListOfBigDecimal20" table="LINKEDLIST_OF_BIG_DECIMAL20">
+ <field name="LinkedListOfBigDecimal19"
+ table="LINKEDLIST_OF_BIG_DECIMAL19">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfBigInteger21" table="LINKEDLIST_OF_BIG_INTEGER21">
+ <field name="LinkedListOfBigInteger21"
+ table="LINKEDLIST_OF_BIG_INTEGER21">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfBigInteger22" column="LINKEDLIST_OF_BIG_INTEGER22"
- >
+ <field name="LinkedListOfBigInteger23"
+ column="LINKEDLIST_OF_BIG_INTEGER23">
</field>
- <field name="LinkedListOfBigInteger23" table="LINKEDLIST_OF_BIG_INTEGER23">
+ <field name="LinkedListOfBigInteger22"
+ table="LINKEDLIST_OF_BIG_INTEGER22">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfByte24" table="LINKEDLIST_OF_BYTE24">
+ <field name="LinkedListOfByte24"
+ table="LINKEDLIST_OF_BYTE24">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfByte25" column="LINKEDLIST_OF_BYTE25"
- >
+ <field name="LinkedListOfByte26"
+ column="LINKEDLIST_OF_BYTE26">
</field>
- <field name="LinkedListOfByte26" table="LINKEDLIST_OF_BYTE26">
+ <field name="LinkedListOfByte25"
+ table="LINKEDLIST_OF_BYTE25">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfDouble27" table="LINKEDLIST_OF_DOUBLE27">
+ <field name="LinkedListOfDouble27"
+ table="LINKEDLIST_OF_DOUBLE27">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfDouble28" column="LINKEDLIST_OF_DOUBLE28"
- >
+ <field name="LinkedListOfDouble29"
+ column="LINKEDLIST_OF_DOUBLE29">
</field>
- <field name="LinkedListOfDouble29" table="LINKEDLIST_OF_DOUBLE29">
+ <field name="LinkedListOfDouble28"
+ table="LINKEDLIST_OF_DOUBLE28">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfFloat30" table="LINKEDLIST_OF_FLOAT30">
+ <field name="LinkedListOfFloat30"
+ table="LINKEDLIST_OF_FLOAT30">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfFloat31" column="LINKEDLIST_OF_FLOAT31"
- >
+ <field name="LinkedListOfFloat32"
+ column="LINKEDLIST_OF_FLOAT32">
</field>
- <field name="LinkedListOfFloat32" table="LINKEDLIST_OF_FLOAT32">
+ <field name="LinkedListOfFloat31"
+ table="LINKEDLIST_OF_FLOAT31">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfInteger33" table="LINKEDLIST_OF_INTEGER33">
+ <field name="LinkedListOfInteger33"
+ table="LINKEDLIST_OF_INTEGER33">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfInteger34" column="LINKEDLIST_OF_INTEGER34"
- >
+ <field name="LinkedListOfInteger35"
+ column="LINKEDLIST_OF_INTEGER35">
</field>
- <field name="LinkedListOfInteger35" table="LINKEDLIST_OF_INTEGER35">
+ <field name="LinkedListOfInteger34"
+ table="LINKEDLIST_OF_INTEGER34">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfLong36" table="LINKEDLIST_OF_LONG36">
+ <field name="LinkedListOfLong36"
+ table="LINKEDLIST_OF_LONG36">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfLong37" column="LINKEDLIST_OF_LONG37"
- >
+ <field name="LinkedListOfLong38"
+ column="LINKEDLIST_OF_LONG38">
</field>
- <field name="LinkedListOfLong38" table="LINKEDLIST_OF_LONG38">
+ <field name="LinkedListOfLong37"
+ table="LINKEDLIST_OF_LONG37">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfShort39" table="LINKEDLIST_OF_SHORT39">
+ <field name="LinkedListOfShort39"
+ table="LINKEDLIST_OF_SHORT39">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="LinkedListOfShort40" column="LINKEDLIST_OF_SHORT40"
- >
+ <field name="LinkedListOfShort41"
+ column="LINKEDLIST_OF_SHORT41">
</field>
- <field name="LinkedListOfShort41" table="LINKEDLIST_OF_SHORT41">
+ <field name="LinkedListOfShort40"
+ table="LINKEDLIST_OF_SHORT40">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
</class>
</package>
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm Mon Oct 10 13:35:04 2005
@@ -5,193 +5,245 @@
<class name="ListCollections" table="LIST_COLLECTIONS">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="ListOfObject0" table="LIST_OF_OBJECT0">
+ <field name="ListOfObject0"
+ table="LIST_OF_OBJECT0">
<join column="IDENTIFIER"/>
<element column="OBJREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfObject1" table="LIST_OF_OBJECT1">
+ <field name="ListOfObject1"
+ table="LIST_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfObject2" table="LIST_OF_OBJECT2">
+ <field name="ListOfObject2"
+ table="LIST_OF_OBJECT2">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfSimpleClass3" table="LIST_OF_SIMPLE_CLASS3">
+ <field name="ListOfSimpleClass3"
+ table="LIST_OF_SIMPLE_CLASS3">
<join column="IDENTIFIER"/>
<element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfSimpleClass4" table="LIST_OF_SIMPLE_CLASS4">
+ <field name="ListOfSimpleClass4"
+ table="LIST_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
- </field>
- <field name="ListOfSimpleClass5" table="LIST_OF_SIMPLE_CLASS5">
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="ListOfSimpleClass5"
+ table="LIST_OF_SIMPLE_CLASS5">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="ListOfSimpleClass42"
+ column="LIST_OF_SIMPLE_CLASS42">
</field>
- <field name="ListOfSimpleInterface6" table="LIST_OF_SIMPLE_INTERFACE6">
+ <field name="ListOfSimpleInterface6"
+ table="LIST_OF_SIMPLE_INTERFACE6">
<join column="IDENTIFIER"/>
<element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfSimpleInterface7" table="LIST_OF_SIMPLE_INTERFACE7">
+ <field name="ListOfSimpleInterface7"
+ table="LIST_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfSimpleInterface8" table="LIST_OF_SIMPLE_INTERFACE8">
+ <field name="ListOfSimpleInterface8"
+ table="LIST_OF_SIMPLE_INTERFACE8">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfString9" table="LIST_OF_STRING9">
+ <field name="ListOfString9"
+ table="LIST_OF_STRING9">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfString10" column="LIST_OF_STRING10"
- >
+ <field name="ListOfString11"
+ column="LIST_OF_STRING11">
</field>
- <field name="ListOfString11" table="LIST_OF_STRING11">
+ <field name="ListOfString10"
+ table="LIST_OF_STRING10">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfDate12" table="LIST_OF_DATE12">
+ <field name="ListOfDate12"
+ table="LIST_OF_DATE12">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfDate13" column="LIST_OF_DATE13"
- >
+ <field name="ListOfDate14"
+ column="LIST_OF_DATE14">
</field>
- <field name="ListOfDate14" table="LIST_OF_DATE14">
+ <field name="ListOfDate13"
+ table="LIST_OF_DATE13">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfLocale15" table="LIST_OF_LOCALE15">
+ <field name="ListOfLocale15"
+ table="LIST_OF_LOCALE15">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfLocale16" column="LIST_OF_LOCALE16"
- >
+ <field name="ListOfLocale17"
+ column="LIST_OF_LOCALE17">
</field>
- <field name="ListOfLocale17" table="LIST_OF_LOCALE17">
+ <field name="ListOfLocale16"
+ table="LIST_OF_LOCALE16">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfBigDecimal18" table="LIST_OF_BIG_DECIMAL18">
+ <field name="ListOfBigDecimal18"
+ table="LIST_OF_BIG_DECIMAL18">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfBigDecimal19" column="LIST_OF_BIG_DECIMAL19"
- >
+ <field name="ListOfBigDecimal20"
+ column="LIST_OF_BIG_DECIMAL20">
</field>
- <field name="ListOfBigDecimal20" table="LIST_OF_BIG_DECIMAL20">
+ <field name="ListOfBigDecimal19"
+ table="LIST_OF_BIG_DECIMAL19">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfBigInteger21" table="LIST_OF_BIG_INTEGER21">
+ <field name="ListOfBigInteger21"
+ table="LIST_OF_BIG_INTEGER21">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfBigInteger22" column="LIST_OF_BIG_INTEGER22"
- >
+ <field name="ListOfBigInteger23"
+ column="LIST_OF_BIG_INTEGER23">
</field>
- <field name="ListOfBigInteger23" table="LIST_OF_BIG_INTEGER23">
+ <field name="ListOfBigInteger22"
+ table="LIST_OF_BIG_INTEGER22">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfByte24" table="LIST_OF_BYTE24">
+ <field name="ListOfByte24"
+ table="LIST_OF_BYTE24">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfByte25" column="LIST_OF_BYTE25"
- >
+ <field name="ListOfByte26"
+ column="LIST_OF_BYTE26">
</field>
- <field name="ListOfByte26" table="LIST_OF_BYTE26">
+ <field name="ListOfByte25"
+ table="LIST_OF_BYTE25">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfDouble27" table="LIST_OF_DOUBLE27">
+ <field name="ListOfDouble27"
+ table="LIST_OF_DOUBLE27">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfDouble28" column="LIST_OF_DOUBLE28"
- >
+ <field name="ListOfDouble29"
+ column="LIST_OF_DOUBLE29">
</field>
- <field name="ListOfDouble29" table="LIST_OF_DOUBLE29">
+ <field name="ListOfDouble28"
+ table="LIST_OF_DOUBLE28">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfFloat30" table="LIST_OF_FLOAT30">
+ <field name="ListOfFloat30"
+ table="LIST_OF_FLOAT30">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfFloat31" column="LIST_OF_FLOAT31"
- >
+ <field name="ListOfFloat32"
+ column="LIST_OF_FLOAT32">
</field>
- <field name="ListOfFloat32" table="LIST_OF_FLOAT32">
+ <field name="ListOfFloat31"
+ table="LIST_OF_FLOAT31">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfInteger33" table="LIST_OF_INTEGER33">
+ <field name="ListOfInteger33"
+ table="LIST_OF_INTEGER33">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfInteger34" column="LIST_OF_INTEGER34"
- >
+ <field name="ListOfInteger35"
+ column="LIST_OF_INTEGER35">
</field>
- <field name="ListOfInteger35" table="LIST_OF_INTEGER35">
+ <field name="ListOfInteger34"
+ table="LIST_OF_INTEGER34">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfLong36" table="LIST_OF_LONG36">
+ <field name="ListOfLong36"
+ table="LIST_OF_LONG36">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfLong37" column="LIST_OF_LONG37"
- >
+ <field name="ListOfLong38"
+ column="LIST_OF_LONG38">
</field>
- <field name="ListOfLong38" table="LIST_OF_LONG38">
+ <field name="ListOfLong37"
+ table="LIST_OF_LONG37">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfShort39" table="LIST_OF_SHORT39">
+ <field name="ListOfShort39"
+ table="LIST_OF_SHORT39">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="ListOfShort40" column="LIST_OF_SHORT40"
- >
+ <field name="ListOfShort41"
+ column="LIST_OF_SHORT41">
</field>
- <field name="ListOfShort41" table="LIST_OF_SHORT41">
+ <field name="ListOfShort40"
+ table="LIST_OF_SHORT40">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
</class>
</package>
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=312732&r1=312731&r2=312732&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 Mon Oct 10 13:35:04 2005
@@ -5,162 +5,245 @@
<class name="SetCollections" table="SET_COLLECTIONS">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="SetOfObject0" table="SET_OF_OBJECT0">
+ <field name="SetOfObject0"
+ table="SET_OF_OBJECT0">
<join column="IDENTIFIER"/>
<element column="OBJREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfObject1" table="SET_OF_OBJECT1">
+ <field name="SetOfObject1"
+ table="SET_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfObject2" table="SET_OF_OBJECT2">
+ <field name="SetOfObject2"
+ table="SET_OF_OBJECT2">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfSimpleClass3" table="SET_OF_SIMPLE_CLASS3">
+ <field name="SetOfSimpleClass3"
+ table="SET_OF_SIMPLE_CLASS3">
<join column="IDENTIFIER"/>
<element column="SIMPCLSREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfSimpleClass4" table="SET_OF_SIMPLE_CLASS4">
+ <field name="SetOfSimpleClass4"
+ table="SET_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- </field>
- <field name="SetOfSimpleClass5" table="SET_OF_SIMPLE_CLASS5">
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="SetOfSimpleClass5"
+ table="SET_OF_SIMPLE_CLASS5">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="SetOfSimpleClass42"
+ column="SET_OF_SIMPLE_CLASS42">
</field>
- <field name="SetOfSimpleInterface6" table="SET_OF_SIMPLE_INTERFACE6">
+ <field name="SetOfSimpleInterface6"
+ table="SET_OF_SIMPLE_INTERFACE6">
<join column="IDENTIFIER"/>
<element column="SIMPINTREF"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfSimpleInterface7" table="SET_OF_SIMPLE_INTERFACE7">
+ <field name="SetOfSimpleInterface7"
+ table="SET_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfSimpleInterface8" table="SET_OF_SIMPLE_INTERFACE8">
+ <field name="SetOfSimpleInterface8"
+ table="SET_OF_SIMPLE_INTERFACE8">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfString9" table="SET_OF_STRING9">
+ <field name="SetOfString9"
+ table="SET_OF_STRING9">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfString10" column="SET_OF_STRING10"
- >
+ <field name="SetOfString11"
+ column="SET_OF_STRING11">
</field>
- <field name="SetOfString11" table="SET_OF_STRING11">
+ <field name="SetOfString10"
+ table="SET_OF_STRING10">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfDate12" table="SET_OF_DATE12">
+ <field name="SetOfDate12"
+ table="SET_OF_DATE12">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfDate13" column="SET_OF_DATE13"
- >
+ <field name="SetOfDate14"
+ column="SET_OF_DATE14">
</field>
- <field name="SetOfDate14" table="SET_OF_DATE14">
+ <field name="SetOfDate13"
+ table="SET_OF_DATE13">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfLocale15" table="SET_OF_LOCALE15">
+ <field name="SetOfLocale15"
+ table="SET_OF_LOCALE15">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfLocale16" column="SET_OF_LOCALE16"
- >
+ <field name="SetOfLocale17"
+ column="SET_OF_LOCALE17">
</field>
- <field name="SetOfLocale17" table="SET_OF_LOCALE17">
+ <field name="SetOfLocale16"
+ table="SET_OF_LOCALE16">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfBigDecimal18" table="SET_OF_BIG_DECIMAL18">
+ <field name="SetOfBigDecimal18"
+ table="SET_OF_BIG_DECIMAL18">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL19"
- >
+ <field name="SetOfBigDecimal20"
+ column="SET_OF_BIG_DECIMAL20">
</field>
- <field name="SetOfBigDecimal20" table="SET_OF_BIG_DECIMAL20">
+ <field name="SetOfBigDecimal19"
+ table="SET_OF_BIG_DECIMAL19">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfBigInteger21" table="SET_OF_BIG_INTEGER21">
+ <field name="SetOfBigInteger21"
+ table="SET_OF_BIG_INTEGER21">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22"
- >
+ <field name="SetOfBigInteger23"
+ column="SET_OF_BIG_INTEGER23">
</field>
- <field name="SetOfBigInteger23" table="SET_OF_BIG_INTEGER23">
+ <field name="SetOfBigInteger22"
+ table="SET_OF_BIG_INTEGER22">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfByte24" table="SET_OF_BYTE24">
+ <field name="SetOfByte24"
+ table="SET_OF_BYTE24">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfByte25" column="SET_OF_BYTE25"
- >
+ <field name="SetOfByte26"
+ column="SET_OF_BYTE26">
</field>
- <field name="SetOfByte26" table="SET_OF_BYTE26">
+ <field name="SetOfByte25"
+ table="SET_OF_BYTE25">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfDouble27" table="SET_OF_DOUBLE27">
+ <field name="SetOfDouble27"
+ table="SET_OF_DOUBLE27">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfDouble28" column="SET_OF_DOUBLE28"
- >
+ <field name="SetOfDouble29"
+ column="SET_OF_DOUBLE29">
</field>
- <field name="SetOfDouble29" table="SET_OF_DOUBLE29">
+ <field name="SetOfDouble28"
+ table="SET_OF_DOUBLE28">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfFloat30" table="SET_OF_FLOAT30">
+ <field name="SetOfFloat30"
+ table="SET_OF_FLOAT30">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfFloat31" column="SET_OF_FLOAT31"
- >
+ <field name="SetOfFloat32"
+ column="SET_OF_FLOAT32">
</field>
- <field name="SetOfFloat32" table="SET_OF_FLOAT32">
+ <field name="SetOfFloat31"
+ table="SET_OF_FLOAT31">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfInteger33" table="SET_OF_INTEGER33">
+ <field name="SetOfInteger33"
+ table="SET_OF_INTEGER33">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfInteger34" column="SET_OF_INTEGER34"
- >
+ <field name="SetOfInteger35"
+ column="SET_OF_INTEGER35">
</field>
- <field name="SetOfInteger35" table="SET_OF_INTEGER35">
+ <field name="SetOfInteger34"
+ table="SET_OF_INTEGER34">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfLong36" table="SET_OF_LONG36">
+ <field name="SetOfLong36"
+ table="SET_OF_LONG36">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfLong37" column="SET_OF_LONG37"
- >
+ <field name="SetOfLong38"
+ column="SET_OF_LONG38">
</field>
- <field name="SetOfLong38" table="SET_OF_LONG38">
+ <field name="SetOfLong37"
+ table="SET_OF_LONG37">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfShort39" table="SET_OF_SHORT39">
+ <field name="SetOfShort39"
+ table="SET_OF_SHORT39">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="SetOfShort40" column="SET_OF_SHORT40"
- >
+ <field name="SetOfShort41"
+ column="SET_OF_SHORT41">
</field>
- <field name="SetOfShort41" table="SET_OF_SHORT41">
+ <field name="SetOfShort40"
+ table="SET_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/VectorCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm?rev=312732&r1=312731&r2=312732&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/VectorCollections-derby.orm Mon Oct 10 13:35:04 2005
@@ -5,193 +5,245 @@
<class name="VectorCollections" table="VECTOR_COLLECTIONS">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="VectorOfObject0" table="VECTOR_OF_OBJECT0">
+ <field name="VectorOfObject0"
+ table="VECTOR_OF_OBJECT0">
<join column="IDENTIFIER"/>
<element column="OBJREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfObject1" table="VECTOR_OF_OBJECT1">
+ <field name="VectorOfObject1"
+ table="VECTOR_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfObject2" table="VECTOR_OF_OBJECT2">
+ <field name="VectorOfObject2"
+ table="VECTOR_OF_OBJECT2">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfSimpleClass3" table="VECTOR_OF_SIMPLE_CLASS3">
+ <field name="VectorOfSimpleClass3"
+ table="VECTOR_OF_SIMPLE_CLASS3">
<join column="IDENTIFIER"/>
<element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfSimpleClass4" table="VECTOR_OF_SIMPLE_CLASS4">
+ <field name="VectorOfSimpleClass4"
+ table="VECTOR_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
- </field>
- <field name="VectorOfSimpleClass5" table="VECTOR_OF_SIMPLE_CLASS5">
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="VectorOfSimpleClass5"
+ table="VECTOR_OF_SIMPLE_CLASS5">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
+ </field>
+ <field name="VectorOfSimpleClass42"
+ column="VECTOR_OF_SIMPLE_CLASS42">
</field>
- <field name="VectorOfSimpleInterface6" table="VECTOR_OF_SIMPLE_INTERFACE6">
+ <field name="VectorOfSimpleInterface6"
+ table="VECTOR_OF_SIMPLE_INTERFACE6">
<join column="IDENTIFIER"/>
<element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfSimpleInterface7" table="VECTOR_OF_SIMPLE_INTERFACE7">
+ <field name="VectorOfSimpleInterface7"
+ table="VECTOR_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfSimpleInterface8" table="VECTOR_OF_SIMPLE_INTERFACE8">
+ <field name="VectorOfSimpleInterface8"
+ table="VECTOR_OF_SIMPLE_INTERFACE8">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
- <order column="INDEX"/>
+ <element column="COLLVAL"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfString9" table="VECTOR_OF_STRING9">
+ <field name="VectorOfString9"
+ table="VECTOR_OF_STRING9">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfString10" column="VECTOR_OF_STRING10"
- >
+ <field name="VectorOfString11"
+ column="VECTOR_OF_STRING11">
</field>
- <field name="VectorOfString11" table="VECTOR_OF_STRING11">
+ <field name="VectorOfString10"
+ table="VECTOR_OF_STRING10">
<join column="IDENTIFIER"/>
<element column="STRINGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfDate12" table="VECTOR_OF_DATE12">
+ <field name="VectorOfDate12"
+ table="VECTOR_OF_DATE12">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfDate13" column="VECTOR_OF_DATE13"
- >
+ <field name="VectorOfDate14"
+ column="VECTOR_OF_DATE14">
</field>
- <field name="VectorOfDate14" table="VECTOR_OF_DATE14">
+ <field name="VectorOfDate13"
+ table="VECTOR_OF_DATE13">
<join column="IDENTIFIER"/>
<element column="DATEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfLocale15" table="VECTOR_OF_LOCALE15">
+ <field name="VectorOfLocale15"
+ table="VECTOR_OF_LOCALE15">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfLocale16" column="VECTOR_OF_LOCALE16"
- >
+ <field name="VectorOfLocale17"
+ column="VECTOR_OF_LOCALE17">
</field>
- <field name="VectorOfLocale17" table="VECTOR_OF_LOCALE17">
+ <field name="VectorOfLocale16"
+ table="VECTOR_OF_LOCALE16">
<join column="IDENTIFIER"/>
<element column="LOCALEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfBigDecimal18" table="VECTOR_OF_BIG_DECIMAL18">
+ <field name="VectorOfBigDecimal18"
+ table="VECTOR_OF_BIG_DECIMAL18">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfBigDecimal19" column="VECTOR_OF_BIG_DECIMAL19"
- >
+ <field name="VectorOfBigDecimal20"
+ column="VECTOR_OF_BIG_DECIMAL20">
</field>
- <field name="VectorOfBigDecimal20" table="VECTOR_OF_BIG_DECIMAL20">
+ <field name="VectorOfBigDecimal19"
+ table="VECTOR_OF_BIG_DECIMAL19">
<join column="IDENTIFIER"/>
<element column="BIG_DECIMALVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfBigInteger21" table="VECTOR_OF_BIG_INTEGER21">
+ <field name="VectorOfBigInteger21"
+ table="VECTOR_OF_BIG_INTEGER21">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfBigInteger22" column="VECTOR_OF_BIG_INTEGER22"
- >
+ <field name="VectorOfBigInteger23"
+ column="VECTOR_OF_BIG_INTEGER23">
</field>
- <field name="VectorOfBigInteger23" table="VECTOR_OF_BIG_INTEGER23">
+ <field name="VectorOfBigInteger22"
+ table="VECTOR_OF_BIG_INTEGER22">
<join column="IDENTIFIER"/>
<element column="BIG_INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfByte24" table="VECTOR_OF_BYTE24">
+ <field name="VectorOfByte24"
+ table="VECTOR_OF_BYTE24">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfByte25" column="VECTOR_OF_BYTE25"
- >
+ <field name="VectorOfByte26"
+ column="VECTOR_OF_BYTE26">
</field>
- <field name="VectorOfByte26" table="VECTOR_OF_BYTE26">
+ <field name="VectorOfByte25"
+ table="VECTOR_OF_BYTE25">
<join column="IDENTIFIER"/>
<element column="BYTEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfDouble27" table="VECTOR_OF_DOUBLE27">
+ <field name="VectorOfDouble27"
+ table="VECTOR_OF_DOUBLE27">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfDouble28" column="VECTOR_OF_DOUBLE28"
- >
+ <field name="VectorOfDouble29"
+ column="VECTOR_OF_DOUBLE29">
</field>
- <field name="VectorOfDouble29" table="VECTOR_OF_DOUBLE29">
+ <field name="VectorOfDouble28"
+ table="VECTOR_OF_DOUBLE28">
<join column="IDENTIFIER"/>
<element column="DOUBLEVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfFloat30" table="VECTOR_OF_FLOAT30">
+ <field name="VectorOfFloat30"
+ table="VECTOR_OF_FLOAT30">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfFloat31" column="VECTOR_OF_FLOAT31"
- >
+ <field name="VectorOfFloat32"
+ column="VECTOR_OF_FLOAT32">
</field>
- <field name="VectorOfFloat32" table="VECTOR_OF_FLOAT32">
+ <field name="VectorOfFloat31"
+ table="VECTOR_OF_FLOAT31">
<join column="IDENTIFIER"/>
<element column="FLOATVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfInteger33" table="VECTOR_OF_INTEGER33">
+ <field name="VectorOfInteger33"
+ table="VECTOR_OF_INTEGER33">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfInteger34" column="VECTOR_OF_INTEGER34"
- >
+ <field name="VectorOfInteger35"
+ column="VECTOR_OF_INTEGER35">
</field>
- <field name="VectorOfInteger35" table="VECTOR_OF_INTEGER35">
+ <field name="VectorOfInteger34"
+ table="VECTOR_OF_INTEGER34">
<join column="IDENTIFIER"/>
<element column="INTEGERVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfLong36" table="VECTOR_OF_LONG36">
+ <field name="VectorOfLong36"
+ table="VECTOR_OF_LONG36">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfLong37" column="VECTOR_OF_LONG37"
- >
+ <field name="VectorOfLong38"
+ column="VECTOR_OF_LONG38">
</field>
- <field name="VectorOfLong38" table="VECTOR_OF_LONG38">
+ <field name="VectorOfLong37"
+ table="VECTOR_OF_LONG37">
<join column="IDENTIFIER"/>
<element column="LONGVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfShort39" table="VECTOR_OF_SHORT39">
+ <field name="VectorOfShort39"
+ table="VECTOR_OF_SHORT39">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
- <field name="VectorOfShort40" column="VECTOR_OF_SHORT40"
- >
+ <field name="VectorOfShort41"
+ column="VECTOR_OF_SHORT41">
</field>
- <field name="VectorOfShort41" table="VECTOR_OF_SHORT41">
+ <field name="VectorOfShort40"
+ table="VECTOR_OF_SHORT40">
<join column="IDENTIFIER"/>
<element column="SHORTVAL"/>
- <order column="INDEX"/>
+ <order column="ALLOW_DUPLICATES"/>
</field>
</class>
</package>