db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r332699 - in /incubator/jdo/trunk/tck20/test/orm: applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
Date Sat, 12 Nov 2005 01:29:53 GMT
Author: mcaisse
Date: Fri Nov 11 17:29:48 2005
New Revision: 332699

URL: http://svn.apache.org/viewcvs?rev=332699&view=rev
Log:
JDO-211

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -7,6 +7,21 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -16,7 +31,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
+            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -27,7 +42,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
+            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -38,21 +53,6 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
             <field name="HashMapOfObject_String8" column="HASHMAP_OBJECT8_STR">
             </field>
             <field name="HashMapOfSimpleClass_String9"
@@ -70,6 +70,24 @@
             <field name="HashMapOfSimpleClass_String10"
                    table="HASHMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfSimpleClass_String11"
+                   table="HASHMAP_SIMPLE_CLASS11_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfSimpleClass_String12"
+                   table="HASHMAP_SIMPLE_CLASS12_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfSimpleClass_String13"
+                   table="HASHMAP_SIMPLE_CLASS13_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -79,8 +97,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String11"
-                   table="HASHMAP_SIMPLE_CLASS11_STR">
+            <field name="HashMapOfSimpleClass_String15"
+                   table="HASHMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -91,29 +109,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String12"
-                   table="HASHMAP_SIMPLE_CLASS12_STR">
+            <field name="HashMapOfSimpleClass_String17"
+                   column="HASHMAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="HashMapOfSimpleInterface_String18"
+                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String13"
-                   table="HASHMAP_SIMPLE_CLASS13_STR">
+            <field name="HashMapOfSimpleInterface_String19"
+                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String15"
-                   table="HASHMAP_SIMPLE_CLASS15_STR">
+            <field name="HashMapOfSimpleInterface_String20"
+                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String17"
-                   column="HASHMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashMapOfSimpleInterface_String18"
-                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
+            <field name="HashMapOfSimpleInterface_String21"
+                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -124,8 +142,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String19"
-                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
+            <field name="HashMapOfSimpleInterface_String22"
+                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -136,8 +154,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String20"
-                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
+            <field name="HashMapOfSimpleInterface_String24"
+                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -146,24 +164,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String21"
-                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String22"
-                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String24"
-                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -8,6 +8,24 @@
             <field name="HashtableOfObject_String0"
                    table="HASHTBL_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String1"
+                   table="HASHTBL_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String2"
+                   table="HASHTBL_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String3"
+                   table="HASHTBL_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -17,8 +35,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String1"
-                   table="HASHTBL_OBJECT1_STR">
+            <field name="HashtableOfObject_String4"
+                   table="HASHTBL_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -29,8 +47,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String2"
-                   table="HASHTBL_OBJECT2_STR">
+            <field name="HashtableOfObject_String6"
+                   table="HASHTBL_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -41,29 +59,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String3"
-                   table="HASHTBL_OBJECT3_STR">
+            <field name="HashtableOfObject_String8"
+                   column="HASHTBL_OBJECT8_STR">
+            </field>
+            <field name="HashtableOfSimpleClass_String9"
+                   table="HASHTBL_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String4"
-                   table="HASHTBL_OBJECT4_STR">
+            <field name="HashtableOfSimpleClass_String10"
+                   table="HASHTBL_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String6"
-                   table="HASHTBL_OBJECT6_STR">
+            <field name="HashtableOfSimpleClass_String11"
+                   table="HASHTBL_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String8"
-                   column="HASHTBL_OBJECT8_STR">
-            </field>
-            <field name="HashtableOfSimpleClass_String9"
-                   table="HASHTBL_SIMPLE_CLASS9_STR">
+            <field name="HashtableOfSimpleClass_String12"
+                   table="HASHTBL_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -74,8 +92,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String10"
-                   table="HASHTBL_SIMPLE_CLASS10_STR">
+            <field name="HashtableOfSimpleClass_String13"
+                   table="HASHTBL_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -86,8 +104,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String11"
-                   table="HASHTBL_SIMPLE_CLASS11_STR">
+            <field name="HashtableOfSimpleClass_String15"
+                   table="HASHTBL_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -98,29 +116,28 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String12"
-                   table="HASHTBL_SIMPLE_CLASS12_STR">
+            <field name="HashtableOfSimpleClass_String17"
+                   column="HASHTBL_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="HashtableOfSimpleInterface_String18"
+                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String13"
-                   table="HASHTBL_SIMPLE_CLASS13_STR">
+            <field name="HashtableOfSimpleInterface_String19"
+                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String15"
-                   table="HASHTBL_SIMPLE_CLASS15_STR">
+            <field name="HashtableOfSimpleInterface_String20"
+                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String17"
-                   column="HASHTBL_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashtableOfSimpleInterface_String18"
-                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
+            <field name="HashtableOfSimpleInterface_String21"
+                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -131,8 +148,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleInterface_String19"
-                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
+            <field name="HashtableOfSimpleInterface_String22"
+                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -143,8 +160,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleInterface_String20"
-                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
+            <field name="HashtableOfSimpleInterface_String24"
+                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -153,24 +170,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String21"
-                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String22"
-                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String24"
-                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -7,6 +7,21 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -16,7 +31,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
+            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -27,7 +42,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
+            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -38,25 +53,28 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
+            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
+            </field>
+            <field name="MapOfSimpleClass_String9"
+                   table="MAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
+            <field name="MapOfSimpleClass_String10"
+                   table="MAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
+            <field name="MapOfSimpleClass_String11"
+                   table="MAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
-            </field>
-            <field name="MapOfSimpleClass_String9"
-                   table="MAP_SIMPLE_CLASS9_STR">
+            <field name="MapOfSimpleClass_String12"
+                   table="MAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -67,8 +85,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String10"
-                   table="MAP_SIMPLE_CLASS10_STR">
+            <field name="MapOfSimpleClass_String13"
+                   table="MAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -79,8 +97,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String11"
-                   table="MAP_SIMPLE_CLASS11_STR">
+            <field name="MapOfSimpleClass_String15"
+                   table="MAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -91,29 +109,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String12"
-                   table="MAP_SIMPLE_CLASS12_STR">
+            <field name="MapOfSimpleClass_String17"
+                   column="MAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="MapOfSimpleInterface_String18"
+                   table="MAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String13"
-                   table="MAP_SIMPLE_CLASS13_STR">
+            <field name="MapOfSimpleInterface_String19"
+                   table="MAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String15"
-                   table="MAP_SIMPLE_CLASS15_STR">
+            <field name="MapOfSimpleInterface_String20"
+                   table="MAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String17"
-                   column="MAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="MapOfSimpleInterface_String18"
-                   table="MAP_SIMPLE_INTERFACE18_STR">
+            <field name="MapOfSimpleInterface_String21"
+                   table="MAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -124,8 +142,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String19"
-                   table="MAP_SIMPLE_INTERFACE19_STR">
+            <field name="MapOfSimpleInterface_String22"
+                   table="MAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -136,8 +154,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String20"
-                   table="MAP_SIMPLE_INTERFACE20_STR">
+            <field name="MapOfSimpleInterface_String24"
+                   table="MAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -146,24 +164,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String21"
-                   table="MAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String22"
-                   table="MAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String24"
-                   table="MAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="MapOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -7,6 +7,22 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String3"
+                   table="TREEMAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -16,7 +32,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
+            <field name="TreeMapOfObject_String4"
+                   table="TREEMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -27,7 +44,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
+            <field name="TreeMapOfObject_String6"
+                   table="TREEMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -38,29 +56,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String3"
-                   table="TREEMAP_OBJECT3_STR">
+            <field name="TreeMapOfObject_String8"
+                   column="TREEMAP_OBJECT8_STR">
+            </field>
+            <field name="TreeMapOfSimpleClass_String9"
+                   table="TREEMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String4"
-                   table="TREEMAP_OBJECT4_STR">
+            <field name="TreeMapOfSimpleClass_String10"
+                   table="TREEMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String6"
-                   table="TREEMAP_OBJECT6_STR">
+            <field name="TreeMapOfSimpleClass_String11"
+                   table="TREEMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String8"
-                   column="TREEMAP_OBJECT8_STR">
-            </field>
-            <field name="TreeMapOfSimpleClass_String9"
-                   table="TREEMAP_SIMPLE_CLASS9_STR">
+            <field name="TreeMapOfSimpleClass_String12"
+                   table="TREEMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -71,8 +89,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String10"
-                   table="TREEMAP_SIMPLE_CLASS10_STR">
+            <field name="TreeMapOfSimpleClass_String13"
+                   table="TREEMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -83,8 +101,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String11"
-                   table="TREEMAP_SIMPLE_CLASS11_STR">
+            <field name="TreeMapOfSimpleClass_String15"
+                   table="TREEMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -95,29 +113,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String12"
-                   table="TREEMAP_SIMPLE_CLASS12_STR">
+            <field name="TreeMapOfSimpleClass_String17"
+                   column="TREEMAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="TreeMapOfSimpleInterface_String18"
+                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String13"
-                   table="TREEMAP_SIMPLE_CLASS13_STR">
+            <field name="TreeMapOfSimpleInterface_String19"
+                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String15"
-                   table="TREEMAP_SIMPLE_CLASS15_STR">
+            <field name="TreeMapOfSimpleInterface_String20"
+                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String17"
-                   column="TREEMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="TreeMapOfSimpleInterface_String18"
-                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
+            <field name="TreeMapOfSimpleInterface_String21"
+                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -128,8 +146,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String19"
-                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
+            <field name="TreeMapOfSimpleInterface_String22"
+                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -140,8 +158,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String20"
-                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
+            <field name="TreeMapOfSimpleInterface_String24"
+                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -150,24 +168,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String21"
-                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String22"
-                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String24"
-                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -9,6 +9,21 @@
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfObject_String0" table="HASHMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -18,7 +33,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String1" table="HASHMAP_OBJECT1_STR">
+            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -29,7 +44,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String2" table="HASHMAP_OBJECT2_STR">
+            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -40,25 +55,28 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String3" table="HASHMAP_OBJECT3_STR">
+            <field name="HashMapOfObject_String8" column="HASHMAP_OBJECT8_STR">
+            </field>
+            <field name="HashMapOfSimpleClass_String9"
+                   table="HASHMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String4" table="HASHMAP_OBJECT4_STR">
+            <field name="HashMapOfSimpleClass_String10"
+                   table="HASHMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String6" table="HASHMAP_OBJECT6_STR">
+            <field name="HashMapOfSimpleClass_String11"
+                   table="HASHMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfObject_String8" column="HASHMAP_OBJECT8_STR">
-            </field>
-            <field name="HashMapOfSimpleClass_String9"
-                   table="HASHMAP_SIMPLE_CLASS9_STR">
+            <field name="HashMapOfSimpleClass_String12"
+                   table="HASHMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -69,8 +87,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String10"
-                   table="HASHMAP_SIMPLE_CLASS10_STR">
+            <field name="HashMapOfSimpleClass_String13"
+                   table="HASHMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -81,8 +99,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String11"
-                   table="HASHMAP_SIMPLE_CLASS11_STR">
+            <field name="HashMapOfSimpleClass_String15"
+                   table="HASHMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -93,29 +111,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String12"
-                   table="HASHMAP_SIMPLE_CLASS12_STR">
+            <field name="HashMapOfSimpleClass_String17"
+                   column="HASHMAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="HashMapOfSimpleInterface_String18"
+                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String13"
-                   table="HASHMAP_SIMPLE_CLASS13_STR">
+            <field name="HashMapOfSimpleInterface_String19"
+                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String15"
-                   table="HASHMAP_SIMPLE_CLASS15_STR">
+            <field name="HashMapOfSimpleInterface_String20"
+                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleClass_String17"
-                   column="HASHMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashMapOfSimpleInterface_String18"
-                   table="HASHMAP_SIMPLE_INTERFACE18_STR">
+            <field name="HashMapOfSimpleInterface_String21"
+                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -126,8 +144,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String19"
-                   table="HASHMAP_SIMPLE_INTERFACE19_STR">
+            <field name="HashMapOfSimpleInterface_String22"
+                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -138,8 +156,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashMapOfSimpleInterface_String20"
-                   table="HASHMAP_SIMPLE_INTERFACE20_STR">
+            <field name="HashMapOfSimpleInterface_String24"
+                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -148,24 +166,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String21"
-                   table="HASHMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String22"
-                   table="HASHMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashMapOfSimpleInterface_String24"
-                   table="HASHMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -10,6 +10,24 @@
             <field name="HashtableOfObject_String0"
                    table="HASHTBL_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String1"
+                   table="HASHTBL_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String2"
+                   table="HASHTBL_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="HashtableOfObject_String3"
+                   table="HASHTBL_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -19,8 +37,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String1"
-                   table="HASHTBL_OBJECT1_STR">
+            <field name="HashtableOfObject_String4"
+                   table="HASHTBL_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -31,8 +49,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String2"
-                   table="HASHTBL_OBJECT2_STR">
+            <field name="HashtableOfObject_String6"
+                   table="HASHTBL_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -43,29 +61,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String3"
-                   table="HASHTBL_OBJECT3_STR">
+            <field name="HashtableOfObject_String8"
+                   column="HASHTBL_OBJECT8_STR">
+            </field>
+            <field name="HashtableOfSimpleClass_String9"
+                   table="HASHTBL_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String4"
-                   table="HASHTBL_OBJECT4_STR">
+            <field name="HashtableOfSimpleClass_String10"
+                   table="HASHTBL_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String6"
-                   table="HASHTBL_OBJECT6_STR">
+            <field name="HashtableOfSimpleClass_String11"
+                   table="HASHTBL_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfObject_String8"
-                   column="HASHTBL_OBJECT8_STR">
-            </field>
-            <field name="HashtableOfSimpleClass_String9"
-                   table="HASHTBL_SIMPLE_CLASS9_STR">
+            <field name="HashtableOfSimpleClass_String12"
+                   table="HASHTBL_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -76,8 +94,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String10"
-                   table="HASHTBL_SIMPLE_CLASS10_STR">
+            <field name="HashtableOfSimpleClass_String13"
+                   table="HASHTBL_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -88,8 +106,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String11"
-                   table="HASHTBL_SIMPLE_CLASS11_STR">
+            <field name="HashtableOfSimpleClass_String15"
+                   table="HASHTBL_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -100,29 +118,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String12"
-                   table="HASHTBL_SIMPLE_CLASS12_STR">
+            <field name="HashtableOfSimpleClass_String17"
+                   column="HASHTBL_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="HashtableOfSimpleInterface_String18"
+                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String13"
-                   table="HASHTBL_SIMPLE_CLASS13_STR">
+            <field name="HashtableOfSimpleInterface_String19"
+                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String15"
-                   table="HASHTBL_SIMPLE_CLASS15_STR">
+            <field name="HashtableOfSimpleInterface_String20"
+                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleClass_String17"
-                   column="HASHTBL_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="HashtableOfSimpleInterface_String18"
-                   table="HASHTBL_SIMPLE_INTERFACE18_STR">
+            <field name="HashtableOfSimpleInterface_String21"
+                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -133,8 +151,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleInterface_String19"
-                   table="HASHTBL_SIMPLE_INTERFACE19_STR">
+            <field name="HashtableOfSimpleInterface_String22"
+                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -145,8 +163,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="HashtableOfSimpleInterface_String20"
-                   table="HASHTBL_SIMPLE_INTERFACE20_STR">
+            <field name="HashtableOfSimpleInterface_String24"
+                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -155,24 +173,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String21"
-                   table="HASHTBL_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String22"
-                   table="HASHTBL_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="HashtableOfSimpleInterface_String24"
-                   table="HASHTBL_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -9,6 +9,21 @@
             <field name="identifier" column="IDENTIFIER"/>
             <field name="MapOfObject_String0" table="MAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -18,7 +33,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String1" table="MAP_OBJECT1_STR">
+            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -29,7 +44,7 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String2" table="MAP_OBJECT2_STR">
+            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -40,25 +55,28 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String3" table="MAP_OBJECT3_STR">
+            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
+            </field>
+            <field name="MapOfSimpleClass_String9"
+                   table="MAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String4" table="MAP_OBJECT4_STR">
+            <field name="MapOfSimpleClass_String10"
+                   table="MAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String6" table="MAP_OBJECT6_STR">
+            <field name="MapOfSimpleClass_String11"
+                   table="MAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfObject_String8" column="MAP_OBJECT8_STR">
-            </field>
-            <field name="MapOfSimpleClass_String9"
-                   table="MAP_SIMPLE_CLASS9_STR">
+            <field name="MapOfSimpleClass_String12"
+                   table="MAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -69,8 +87,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String10"
-                   table="MAP_SIMPLE_CLASS10_STR">
+            <field name="MapOfSimpleClass_String13"
+                   table="MAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -81,8 +99,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String11"
-                   table="MAP_SIMPLE_CLASS11_STR">
+            <field name="MapOfSimpleClass_String15"
+                   table="MAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -93,29 +111,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String12"
-                   table="MAP_SIMPLE_CLASS12_STR">
+            <field name="MapOfSimpleClass_String17"
+                   column="MAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="MapOfSimpleInterface_String18"
+                   table="MAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String13"
-                   table="MAP_SIMPLE_CLASS13_STR">
+            <field name="MapOfSimpleInterface_String19"
+                   table="MAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String15"
-                   table="MAP_SIMPLE_CLASS15_STR">
+            <field name="MapOfSimpleInterface_String20"
+                   table="MAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleClass_String17"
-                   column="MAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="MapOfSimpleInterface_String18"
-                   table="MAP_SIMPLE_INTERFACE18_STR">
+            <field name="MapOfSimpleInterface_String21"
+                   table="MAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -126,8 +144,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String19"
-                   table="MAP_SIMPLE_INTERFACE19_STR">
+            <field name="MapOfSimpleInterface_String22"
+                   table="MAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -138,8 +156,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="MapOfSimpleInterface_String20"
-                   table="MAP_SIMPLE_INTERFACE20_STR">
+            <field name="MapOfSimpleInterface_String24"
+                   table="MAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -148,24 +166,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String21"
-                   table="MAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String22"
-                   table="MAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="MapOfSimpleInterface_String24"
-                   table="MAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="MapOfSimpleInterface_String26"

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=332699&r1=332698&r2=332699&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Fri Nov 11 17:29:48 2005
@@ -9,6 +9,22 @@
             <field name="identifier" column="IDENTIFIER"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="TreeMapOfObject_String3"
+                   table="TREEMAP_OBJECT3_STR">
+                <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
                         <field name="id" column="ID"/>
@@ -18,7 +34,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
+            <field name="TreeMapOfObject_String4"
+                   table="TREEMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -29,7 +46,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
+            <field name="TreeMapOfObject_String6"
+                   table="TREEMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -40,29 +58,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String3"
-                   table="TREEMAP_OBJECT3_STR">
+            <field name="TreeMapOfObject_String8"
+                   column="TREEMAP_OBJECT8_STR">
+            </field>
+            <field name="TreeMapOfSimpleClass_String9"
+                   table="TREEMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String4"
-                   table="TREEMAP_OBJECT4_STR">
+            <field name="TreeMapOfSimpleClass_String10"
+                   table="TREEMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String6"
-                   table="TREEMAP_OBJECT6_STR">
+            <field name="TreeMapOfSimpleClass_String11"
+                   table="TREEMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfObject_String8"
-                   column="TREEMAP_OBJECT8_STR">
-            </field>
-            <field name="TreeMapOfSimpleClass_String9"
-                   table="TREEMAP_SIMPLE_CLASS9_STR">
+            <field name="TreeMapOfSimpleClass_String12"
+                   table="TREEMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -73,8 +91,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String10"
-                   table="TREEMAP_SIMPLE_CLASS10_STR">
+            <field name="TreeMapOfSimpleClass_String13"
+                   table="TREEMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -85,8 +103,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String11"
-                   table="TREEMAP_SIMPLE_CLASS11_STR">
+            <field name="TreeMapOfSimpleClass_String15"
+                   table="TREEMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -97,29 +115,29 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String12"
-                   table="TREEMAP_SIMPLE_CLASS12_STR">
+            <field name="TreeMapOfSimpleClass_String17"
+                   column="TREEMAP_SIMPLE_CLASS17_STR">
+            </field>
+            <field name="TreeMapOfSimpleInterface_String18"
+                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String13"
-                   table="TREEMAP_SIMPLE_CLASS13_STR">
+            <field name="TreeMapOfSimpleInterface_String19"
+                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String15"
-                   table="TREEMAP_SIMPLE_CLASS15_STR">
+            <field name="TreeMapOfSimpleInterface_String20"
+                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleClass_String17"
-                   column="TREEMAP_SIMPLE_CLASS17_STR">
-            </field>
-            <field name="TreeMapOfSimpleInterface_String18"
-                   table="TREEMAP_SIMPLE_INTERFACE18_STR">
+            <field name="TreeMapOfSimpleInterface_String21"
+                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -130,8 +148,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String19"
-                   table="TREEMAP_SIMPLE_INTERFACE19_STR">
+            <field name="TreeMapOfSimpleInterface_String22"
+                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -142,8 +160,8 @@
                 </key>
                 <value column="VALUEVAL"/>
             </field>
-            <field name="TreeMapOfSimpleInterface_String20"
-                   table="TREEMAP_SIMPLE_INTERFACE20_STR">
+            <field name="TreeMapOfSimpleInterface_String24"
+                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
@@ -152,24 +170,6 @@
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
                 </key>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String21"
-                   table="TREEMAP_SIMPLE_INTERFACE21_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String22"
-                   table="TREEMAP_SIMPLE_INTERFACE22_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
-                <value column="VALUEVAL"/>
-            </field>
-            <field name="TreeMapOfSimpleInterface_String24"
-                   table="TREEMAP_SIMPLE_INTERFACE24_STR">
-                <join column="IDENTIFIER"/>
-                <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String26"



Mime
View raw message