Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm	(working copy)
@@ -27,7 +27,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -39,7 +39,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -51,7 +51,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -84,7 +84,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -96,7 +96,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -108,7 +108,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -141,7 +141,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -153,7 +153,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -165,7 +165,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm	(working copy)
@@ -26,7 +26,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -37,7 +37,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -48,7 +48,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -80,7 +80,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -92,7 +92,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -104,7 +104,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -137,7 +137,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -149,7 +149,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -161,7 +161,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm	(working copy)
@@ -30,7 +30,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -42,7 +42,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -54,7 +54,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -87,7 +87,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -99,7 +99,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -111,7 +111,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -144,7 +144,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -156,7 +156,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -168,7 +168,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
Index: test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
===================================================================
--- test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(revision 345168)
+++ test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm	(working copy)
@@ -26,7 +26,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -37,7 +37,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -48,7 +48,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -80,7 +80,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -92,7 +92,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -104,7 +104,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -137,7 +137,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -149,7 +149,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>
@@ -161,7 +161,7 @@
                 <join column="IDENTIFIER"/>
                 <key>
                     <embedded>
-                        <field name="id" column="ID"/>
+                        <field name="id" primary-key="true" column="ID"/>
                         <field name="intField" column="INTVAL"/>
                         <field name="stringField" column="STRINGVAL"/>
                     </embedded>