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/05/10 01:06:38 UTC

svn commit: r169373 [2/3] - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/

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=169373&r1=169372&r2=169373&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 Mon May  9 16:06:37 2005
@@ -166,53 +166,21 @@
                 <key column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String27" table="MAP_OF_STRING27_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING">
             </field>
-            <field name="MapOfString_String28" table="MAP_OF_STRING28_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String28" column="MAP_OF_STRING28_STRING">
             </field>
-            <field name="MapOfString_String29" table="MAP_OF_STRING29_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String29" column="MAP_OF_STRING29_STRING">
             </field>
-            <field name="MapOfString_String30" table="MAP_OF_STRING30_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String30" column="MAP_OF_STRING30_STRING">
             </field>
-            <field name="MapOfString_String31" table="MAP_OF_STRING31_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String31" column="MAP_OF_STRING31_STRING">
             </field>
-            <field name="MapOfString_String32" table="MAP_OF_STRING32_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String32" column="MAP_OF_STRING32_STRING">
             </field>
-            <field name="MapOfString_String33" table="MAP_OF_STRING33_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String33" column="MAP_OF_STRING33_STRING">
             </field>
-            <field name="MapOfString_String34" table="MAP_OF_STRING34_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String34" column="MAP_OF_STRING34_STRING">
             </field>
             <field name="MapOfString_String35" table="MAP_OF_STRING35_STRING">
                 <join column="IDENTIFIER"/>
@@ -220,53 +188,21 @@
                 <key column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfDate_String36" table="MAP_OF_DATE36_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING">
             </field>
-            <field name="MapOfDate_String37" table="MAP_OF_DATE37_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String37" column="MAP_OF_DATE37_STRING">
             </field>
-            <field name="MapOfDate_String38" table="MAP_OF_DATE38_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String38" column="MAP_OF_DATE38_STRING">
             </field>
-            <field name="MapOfDate_String39" table="MAP_OF_DATE39_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String39" column="MAP_OF_DATE39_STRING">
             </field>
-            <field name="MapOfDate_String40" table="MAP_OF_DATE40_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String40" column="MAP_OF_DATE40_STRING">
             </field>
-            <field name="MapOfDate_String41" table="MAP_OF_DATE41_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String41" column="MAP_OF_DATE41_STRING">
             </field>
-            <field name="MapOfDate_String42" table="MAP_OF_DATE42_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String42" column="MAP_OF_DATE42_STRING">
             </field>
-            <field name="MapOfDate_String43" table="MAP_OF_DATE43_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDate_String43" column="MAP_OF_DATE43_STRING">
             </field>
             <field name="MapOfDate_String44" table="MAP_OF_DATE44_STRING">
                 <join column="IDENTIFIER"/>
@@ -274,53 +210,21 @@
                 <key column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigDecimal_String45" table="MAP_OF_BIG_DECIMAL45_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING">
             </field>
-            <field name="MapOfBigDecimal_String46" table="MAP_OF_BIG_DECIMAL46_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String46" column="MAP_OF_BIG_DECIMAL46_STRING">
             </field>
-            <field name="MapOfBigDecimal_String47" table="MAP_OF_BIG_DECIMAL47_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String47" column="MAP_OF_BIG_DECIMAL47_STRING">
             </field>
-            <field name="MapOfBigDecimal_String48" table="MAP_OF_BIG_DECIMAL48_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String48" column="MAP_OF_BIG_DECIMAL48_STRING">
             </field>
-            <field name="MapOfBigDecimal_String49" table="MAP_OF_BIG_DECIMAL49_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String49" column="MAP_OF_BIG_DECIMAL49_STRING">
             </field>
-            <field name="MapOfBigDecimal_String50" table="MAP_OF_BIG_DECIMAL50_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String50" column="MAP_OF_BIG_DECIMAL50_STRING">
             </field>
-            <field name="MapOfBigDecimal_String51" table="MAP_OF_BIG_DECIMAL51_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String51" column="MAP_OF_BIG_DECIMAL51_STRING">
             </field>
-            <field name="MapOfBigDecimal_String52" table="MAP_OF_BIG_DECIMAL52_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigDecimal_String52" column="MAP_OF_BIG_DECIMAL52_STRING">
             </field>
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
                 <join column="IDENTIFIER"/>
@@ -328,53 +232,21 @@
                 <key column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfBigInteger_String54" table="MAP_OF_BIG_INTEGER54_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING">
             </field>
-            <field name="MapOfBigInteger_String55" table="MAP_OF_BIG_INTEGER55_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String55" column="MAP_OF_BIG_INTEGER55_STRING">
             </field>
-            <field name="MapOfBigInteger_String56" table="MAP_OF_BIG_INTEGER56_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String56" column="MAP_OF_BIG_INTEGER56_STRING">
             </field>
-            <field name="MapOfBigInteger_String57" table="MAP_OF_BIG_INTEGER57_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String57" column="MAP_OF_BIG_INTEGER57_STRING">
             </field>
-            <field name="MapOfBigInteger_String58" table="MAP_OF_BIG_INTEGER58_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String58" column="MAP_OF_BIG_INTEGER58_STRING">
             </field>
-            <field name="MapOfBigInteger_String59" table="MAP_OF_BIG_INTEGER59_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String59" column="MAP_OF_BIG_INTEGER59_STRING">
             </field>
-            <field name="MapOfBigInteger_String60" table="MAP_OF_BIG_INTEGER60_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String60" column="MAP_OF_BIG_INTEGER60_STRING">
             </field>
-            <field name="MapOfBigInteger_String61" table="MAP_OF_BIG_INTEGER61_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfBigInteger_String61" column="MAP_OF_BIG_INTEGER61_STRING">
             </field>
             <field name="MapOfBigInteger_String62" table="MAP_OF_BIG_INTEGER62_STRING">
                 <join column="IDENTIFIER"/>
@@ -382,53 +254,21 @@
                 <key column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfByte_String63" table="MAP_OF_BYTE63_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING">
             </field>
-            <field name="MapOfByte_String64" table="MAP_OF_BYTE64_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String64" column="MAP_OF_BYTE64_STRING">
             </field>
-            <field name="MapOfByte_String65" table="MAP_OF_BYTE65_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String65" column="MAP_OF_BYTE65_STRING">
             </field>
-            <field name="MapOfByte_String66" table="MAP_OF_BYTE66_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String66" column="MAP_OF_BYTE66_STRING">
             </field>
-            <field name="MapOfByte_String67" table="MAP_OF_BYTE67_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String67" column="MAP_OF_BYTE67_STRING">
             </field>
-            <field name="MapOfByte_String68" table="MAP_OF_BYTE68_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String68" column="MAP_OF_BYTE68_STRING">
             </field>
-            <field name="MapOfByte_String69" table="MAP_OF_BYTE69_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String69" column="MAP_OF_BYTE69_STRING">
             </field>
-            <field name="MapOfByte_String70" table="MAP_OF_BYTE70_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfByte_String70" column="MAP_OF_BYTE70_STRING">
             </field>
             <field name="MapOfByte_String71" table="MAP_OF_BYTE71_STRING">
                 <join column="IDENTIFIER"/>
@@ -436,53 +276,21 @@
                 <key column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfDouble_String72" table="MAP_OF_DOUBLE72_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING">
             </field>
-            <field name="MapOfDouble_String73" table="MAP_OF_DOUBLE73_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String73" column="MAP_OF_DOUBLE73_STRING">
             </field>
-            <field name="MapOfDouble_String74" table="MAP_OF_DOUBLE74_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String74" column="MAP_OF_DOUBLE74_STRING">
             </field>
-            <field name="MapOfDouble_String75" table="MAP_OF_DOUBLE75_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String75" column="MAP_OF_DOUBLE75_STRING">
             </field>
-            <field name="MapOfDouble_String76" table="MAP_OF_DOUBLE76_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String76" column="MAP_OF_DOUBLE76_STRING">
             </field>
-            <field name="MapOfDouble_String77" table="MAP_OF_DOUBLE77_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String77" column="MAP_OF_DOUBLE77_STRING">
             </field>
-            <field name="MapOfDouble_String78" table="MAP_OF_DOUBLE78_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String78" column="MAP_OF_DOUBLE78_STRING">
             </field>
-            <field name="MapOfDouble_String79" table="MAP_OF_DOUBLE79_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfDouble_String79" column="MAP_OF_DOUBLE79_STRING">
             </field>
             <field name="MapOfDouble_String80" table="MAP_OF_DOUBLE80_STRING">
                 <join column="IDENTIFIER"/>
@@ -490,53 +298,21 @@
                 <key column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfFloat_String81" table="MAP_OF_FLOAT81_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING">
             </field>
-            <field name="MapOfFloat_String82" table="MAP_OF_FLOAT82_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String82" column="MAP_OF_FLOAT82_STRING">
             </field>
-            <field name="MapOfFloat_String83" table="MAP_OF_FLOAT83_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String83" column="MAP_OF_FLOAT83_STRING">
             </field>
-            <field name="MapOfFloat_String84" table="MAP_OF_FLOAT84_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String84" column="MAP_OF_FLOAT84_STRING">
             </field>
-            <field name="MapOfFloat_String85" table="MAP_OF_FLOAT85_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String85" column="MAP_OF_FLOAT85_STRING">
             </field>
-            <field name="MapOfFloat_String86" table="MAP_OF_FLOAT86_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String86" column="MAP_OF_FLOAT86_STRING">
             </field>
-            <field name="MapOfFloat_String87" table="MAP_OF_FLOAT87_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String87" column="MAP_OF_FLOAT87_STRING">
             </field>
-            <field name="MapOfFloat_String88" table="MAP_OF_FLOAT88_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfFloat_String88" column="MAP_OF_FLOAT88_STRING">
             </field>
             <field name="MapOfFloat_String89" table="MAP_OF_FLOAT89_STRING">
                 <join column="IDENTIFIER"/>
@@ -544,53 +320,21 @@
                 <key column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfInteger_String90" table="MAP_OF_INTEGER90_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING">
             </field>
-            <field name="MapOfInteger_String91" table="MAP_OF_INTEGER91_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String91" column="MAP_OF_INTEGER91_STRING">
             </field>
-            <field name="MapOfInteger_String92" table="MAP_OF_INTEGER92_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String92" column="MAP_OF_INTEGER92_STRING">
             </field>
-            <field name="MapOfInteger_String93" table="MAP_OF_INTEGER93_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String93" column="MAP_OF_INTEGER93_STRING">
             </field>
-            <field name="MapOfInteger_String94" table="MAP_OF_INTEGER94_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String94" column="MAP_OF_INTEGER94_STRING">
             </field>
-            <field name="MapOfInteger_String95" table="MAP_OF_INTEGER95_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String95" column="MAP_OF_INTEGER95_STRING">
             </field>
-            <field name="MapOfInteger_String96" table="MAP_OF_INTEGER96_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String96" column="MAP_OF_INTEGER96_STRING">
             </field>
-            <field name="MapOfInteger_String97" table="MAP_OF_INTEGER97_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfInteger_String97" column="MAP_OF_INTEGER97_STRING">
             </field>
             <field name="MapOfInteger_String98" table="MAP_OF_INTEGER98_STRING">
                 <join column="IDENTIFIER"/>
@@ -598,53 +342,21 @@
                 <key column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfLong_String99" table="MAP_OF_LONG99_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING">
             </field>
-            <field name="MapOfLong_String100" table="MAP_OF_LONG100_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String100" column="MAP_OF_LONG100_STRING">
             </field>
-            <field name="MapOfLong_String101" table="MAP_OF_LONG101_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String101" column="MAP_OF_LONG101_STRING">
             </field>
-            <field name="MapOfLong_String102" table="MAP_OF_LONG102_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String102" column="MAP_OF_LONG102_STRING">
             </field>
-            <field name="MapOfLong_String103" table="MAP_OF_LONG103_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String103" column="MAP_OF_LONG103_STRING">
             </field>
-            <field name="MapOfLong_String104" table="MAP_OF_LONG104_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String104" column="MAP_OF_LONG104_STRING">
             </field>
-            <field name="MapOfLong_String105" table="MAP_OF_LONG105_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String105" column="MAP_OF_LONG105_STRING">
             </field>
-            <field name="MapOfLong_String106" table="MAP_OF_LONG106_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfLong_String106" column="MAP_OF_LONG106_STRING">
             </field>
             <field name="MapOfLong_String107" table="MAP_OF_LONG107_STRING">
                 <join column="IDENTIFIER"/>
@@ -652,53 +364,21 @@
                 <key column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfShort_String108" table="MAP_OF_SHORT108_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING">
             </field>
-            <field name="MapOfShort_String109" table="MAP_OF_SHORT109_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String109" column="MAP_OF_SHORT109_STRING">
             </field>
-            <field name="MapOfShort_String110" table="MAP_OF_SHORT110_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String110" column="MAP_OF_SHORT110_STRING">
             </field>
-            <field name="MapOfShort_String111" table="MAP_OF_SHORT111_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String111" column="MAP_OF_SHORT111_STRING">
             </field>
-            <field name="MapOfShort_String112" table="MAP_OF_SHORT112_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String112" column="MAP_OF_SHORT112_STRING">
             </field>
-            <field name="MapOfShort_String113" table="MAP_OF_SHORT113_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String113" column="MAP_OF_SHORT113_STRING">
             </field>
-            <field name="MapOfShort_String114" table="MAP_OF_SHORT114_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String114" column="MAP_OF_SHORT114_STRING">
             </field>
-            <field name="MapOfShort_String115" table="MAP_OF_SHORT115_STRING">
-                <join column="IDENTIFIER"/>
-                <value column="STRING"/>
-                <key column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfShort_String115" column="MAP_OF_SHORT115_STRING">
             </field>
             <field name="MapOfShort_String116" table="MAP_OF_SHORT116_STRING">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=169373&r1=169372&r2=169373&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm Mon May  9 16:06:37 2005
@@ -49,165 +49,99 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfString9" table="SET_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfString9" column="SET_OF_STRING9">
             </field>
-            <field name="SetOfString10" table="SET_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfString10" column="SET_OF_STRING10">
             </field>
             <field name="SetOfString11" table="SET_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDate12" table="SET_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfDate12" column="SET_OF_DATE12">
             </field>
-            <field name="SetOfDate13" table="SET_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfDate13" column="SET_OF_DATE13">
             </field>
             <field name="SetOfDate14" table="SET_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLocale15" table="SET_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfLocale15" column="SET_OF_LOCALE15">
             </field>
-            <field name="SetOfLocale16" table="SET_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfLocale16" column="SET_OF_LOCALE16">
             </field>
             <field name="SetOfLocale17" table="SET_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigDecimal18" table="SET_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfBigDecimal18" column="SET_OF_BIG_DECIMAL18">
             </field>
-            <field name="SetOfBigDecimal19" table="SET_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL18">
             </field>
             <field name="SetOfBigDecimal20" table="SET_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfBigInteger21" table="SET_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfBigInteger21" column="SET_OF_BIG_INTEGER21">
             </field>
-            <field name="SetOfBigInteger22" table="SET_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22">
             </field>
             <field name="SetOfBigInteger23" table="SET_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfByte24" table="SET_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfByte24" column="SET_OF_BYTE24">
             </field>
-            <field name="SetOfByte25" table="SET_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfByte25" column="SET_OF_BYTE25">
             </field>
             <field name="SetOfByte26" table="SET_OF_BYTE27">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfDouble27" table="SET_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfDouble27" column="SET_OF_DOUBLE27">
             </field>
-            <field name="SetOfDouble28" table="SET_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfDouble28" column="SET_OF_DOUBLE28">
             </field>
             <field name="SetOfDouble29" table="SET_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfFloat30" table="SET_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfFloat30" column="SET_OF_FLOAT30">
             </field>
-            <field name="SetOfFloat31" table="SET_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfFloat31" column="SET_OF_FLOAT31">
             </field>
             <field name="SetOfFloat32" table="SET_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfInteger33" table="SET_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfInteger33" column="SET_OF_INTEGER33">
             </field>
-            <field name="SetOfInteger34" table="SET_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfInteger34" column="SET_OF_INTEGER34">
             </field>
             <field name="SetOfInteger35" table="SET_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfLong36" table="SET_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfLong36" column="SET_OF_LONG36">
             </field>
-            <field name="SetOfLong37" table="SET_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfLong37" column="SET_OF_LONG37">
             </field>
             <field name="SetOfLong38" table="SET_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="SetOfShort39" table="SET_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfShort39" column="SET_OF_SHORT39">
             </field>
-            <field name="SetOfShort40" table="SET_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="SetOfShort40" column="SET_OF_SHORT40">
             </field>
             <field name="SetOfShort41" table="SET_OF_SHORT41">
                 <join column="IDENTIFIER"/>