db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r169373 [1/3] - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/
Date Mon, 09 May 2005 23:06:38 GMT
Author: mcaisse
Date: Mon May  9 16:06:37 2005
New Revision: 169373

URL: http://svn.apache.org/viewcvs?rev=169373&view=rev
Log:
interim checkin JDO-8

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-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/SetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=169373&r1=169372&r2=169373&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Mon May  9 16:06:37 2005
@@ -1,152 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
-<!--
-Metadata for application identity
--->
-<orm>
-    <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
-            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
-            <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
-                <element column="OBJREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfSimpleInterface4" table="ARRAY_OF_SIMPLE_INTERFACE4">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5">
-                <join column="IDENTIFIER"/>
-                <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfString6" table="ARRAY_OF_STRING6">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfDate8" table="ARRAY_OF_DATE8">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfLocale10" table="ARRAY_OF_LOCALE10">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfBigDecimal12" table="ARRAY_OF_BIG_DECIMAL12">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfBigInteger14" table="ARRAY_OF_BIG_INTEGER14">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfByte16" table="ARRAY_OF_BYTE16">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfDouble18" table="ARRAY_OF_DOUBLE18">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfFloat20" table="ARRAY_OF_FLOAT20">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfInteger22" table="ARRAY_OF_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfLong24" table="ARRAY_OF_LONG24">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfShort26" table="ARRAY_OF_SHORT26">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-            <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
-            </field>
-        </class>
-    </package>
-</orm>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<!--
+Metadata for application identity
+-->
+<orm>
+    <package name="org.apache.jdo.tck.pc.fieldtypes">
+        <class name="ArrayCollections" table="ARRAY_COLLECTIONS">
+            <field name="identifier" column="IDENTIFIER" primary-key="true"/>
+            <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
+            <field name="ArrayOfObject1" column="ARRAY_OF_OBJECT1"/>
+            <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"/>
+            <field name="ArrayOfSimpleClass3" column="ARRAY_OF_SIMPLE_CLASS3"/>
+            <field name="ArrayOfSimpleInterface4" column="ARRAY_OF_SIMPLE_INTERFACE4"/>
+            <field name="ArrayOfSimpleInterface5" column="ARRAY_OF_SIMPLE_INTERFACE5"/>
+            <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
+            <field name="ArrayOfString7" column="ARRAY_OF_STRING7"/>
+            <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
+            <field name="ArrayOfDate9" column="ARRAY_OF_DATE9"/>
+            <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
+            <field name="ArrayOfLocale11" column="ARRAY_OF_LOCALE11"/>
+            <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
+            <field name="ArrayOfBigDecimal13" column="ARRAY_OF_BIG_DECIMAL13"/>
+            <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
+            <field name="ArrayOfBigInteger15" column="ARRAY_OF_BIG_INTEGER15"/>
+            <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
+            <field name="ArrayOfByte17" column="ARRAY_OF_BYTE17"/>
+            <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
+            <field name="ArrayOfDouble19" column="ARRAY_OF_DOUBLE19"/>
+            <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
+            <field name="ArrayOfFloat21" column="ARRAY_OF_FLOAT21"/>
+            <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
+            <field name="ArrayOfInteger23" column="ARRAY_OF_INTEGER23"/>
+            <field name="ArrayOfLong25" column="ARRAY_OF_LONG25"/>
+            <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
+            <field name="ArrayOfShort27" column="ARRAY_OF_SHORT27"/>
+        </class>
+    </package>
+</orm>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=169373&r1=169372&r2=169373&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm Mon May  9 16:06:37 2005
@@ -40,133 +40,89 @@
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
             </field>
-            <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
+            <field name="CollectionOfString9" column="COLLECTION_OF_STRING9">
             </field>
-            <field name="CollectionOfString10" table="COLLECTION_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
+            <field name="CollectionOfString10" column="COLLECTION_OF_STRING10">
             </field>
             <field name="CollectionOfString11" table="COLLECTION_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
             </field>
-            <field name="CollectionOfDate12" table="COLLECTION_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
+            <field name="CollectionOfDate12" column="COLLECTION_OF_DATE12">
             </field>
-            <field name="CollectionOfDate13" table="COLLECTION_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
+            <field name="CollectionOfDate13" column="COLLECTION_OF_DATE13">
             </field>
             <field name="CollectionOfDate14" table="COLLECTION_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
             </field>
-            <field name="CollectionOfLocale15" table="COLLECTION_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
+            <field name="CollectionOfLocale15" column="COLLECTION_OF_LOCALE15">
             </field>
-            <field name="CollectionOfLocale16" table="COLLECTION_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
+            <field name="CollectionOfLocale16" column="COLLECTION_OF_LOCALE16">
             </field>
             <field name="CollectionOfLocale17" table="COLLECTION_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
             </field>
-            <field name="CollectionOfBigDecimal18" table="COLLECTION_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
+            <field name="CollectionOfBigDecimal18" column="COLLECTION_OF_BIG_DECIMAL18">
             </field>
-            <field name="CollectionOfBigDecimal19" table="COLLECTION_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
+            <field name="CollectionOfBigDecimal19" column="COLLECTION_OF_BIG_DECIMAL19">
             </field>
             <field name="CollectionOfBigDecimal20" table="COLLECTION_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
             </field>
-            <field name="CollectionOfBigInteger21" table="COLLECTION_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
+            <field name="CollectionOfBigInteger21" column="COLLECTION_OF_BIG_INTEGER21">
             </field>
-            <field name="CollectionOfBigInteger22" table="COLLECTION_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
+            <field name="CollectionOfBigInteger22" column="COLLECTION_OF_BIG_INTEGER22">
             </field>
             <field name="CollectionOfBigInteger23" table="COLLECTION_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
             </field>
-            <field name="CollectionOfByte24" table="COLLECTION_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
+            <field name="CollectionOfByte24" column="COLLECTION_OF_BYTE24">
             </field>
-            <field name="CollectionOfByte25" table="COLLECTION_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
+            <field name="CollectionOfByte25" column="COLLECTION_OF_BYTE25">
             </field>
             <field name="CollectionOfByte26" table="COLLECTION_OF_BYTE27">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
             </field>
-            <field name="CollectionOfDouble27" table="COLLECTION_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
+            <field name="CollectionOfDouble27" column="COLLECTION_OF_DOUBLE27">
             </field>
-            <field name="CollectionOfDouble28" table="COLLECTION_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
+            <field name="CollectionOfDouble28" column="COLLECTION_OF_DOUBLE28">
             </field>
             <field name="CollectionOfDouble29" table="COLLECTION_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
             </field>
-            <field name="CollectionOfFloat30" table="COLLECTION_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
+            <field name="CollectionOfFloat30" column="COLLECTION_OF_FLOAT30">
             </field>
-            <field name="CollectionOfFloat31" table="COLLECTION_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
+            <field name="CollectionOfFloat31" column="COLLECTION_OF_FLOAT31">
             </field>
             <field name="CollectionOfFloat32" table="COLLECTION_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
             </field>
-            <field name="CollectionOfInteger33" table="COLLECTION_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
+            <field name="CollectionOfInteger33" column="COLLECTION_OF_INTEGER33">
             </field>
-            <field name="CollectionOfInteger34" table="COLLECTION_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
+            <field name="CollectionOfInteger34" column="COLLECTION_OF_INTEGER34">
             </field>
             <field name="CollectionOfInteger35" table="COLLECTION_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
             </field>
-            <field name="CollectionOfLong36" table="COLLECTION_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
+            <field name="CollectionOfLong36" column="COLLECTION_OF_LONG36">
             </field>
-            <field name="CollectionOfLong37" table="COLLECTION_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
+            <field name="CollectionOfLong37" column="COLLECTION_OF_LONG37">
             </field>
             <field name="CollectionOfLong38" table="COLLECTION_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
             </field>
-            <field name="CollectionOfShort39" table="COLLECTION_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
+            <field name="CollectionOfShort39" column="COLLECTION_OF_SHORT39">
             </field>
-            <field name="CollectionOfShort40" table="COLLECTION_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
+            <field name="CollectionOfShort40" column="COLLECTION_OF_SHORT40">
             </field>
             <field name="CollectionOfShort41" table="COLLECTION_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm?rev=169373&r1=169372&r2=169373&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ListCollections-derby.orm Mon May  9 16:06:37 2005
@@ -49,165 +49,99 @@
                 <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfString9" table="LIST_OF_STRING9">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfString9" column="LIST_OF_STRING9">
             </field>
-            <field name="ListOfString10" table="LIST_OF_STRING10">
-                <join column="IDENTIFIER"/>
-                <element column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfString10" column="LIST_OF_STRING10">
             </field>
             <field name="ListOfString11" table="LIST_OF_STRING11">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDate12" table="LIST_OF_DATE12">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfDate12" column="LIST_OF_DATE12">
             </field>
-            <field name="ListOfDate13" table="LIST_OF_DATE13">
-                <join column="IDENTIFIER"/>
-                <element column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfDate13" column="LIST_OF_DATE13">
             </field>
             <field name="ListOfDate14" table="LIST_OF_DATE14">
                 <join column="IDENTIFIER"/>
                 <element column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLocale15" table="LIST_OF_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfLocale15" column="LIST_OF_LOCALE15">
             </field>
-            <field name="ListOfLocale16" table="LIST_OF_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <element column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfLocale16" column="LIST_OF_LOCALE16">
             </field>
             <field name="ListOfLocale17" table="LIST_OF_LOCALE17">
                 <join column="IDENTIFIER"/>
                 <element column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigDecimal18" table="LIST_OF_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfBigDecimal18" column="LIST_OF_BIG_DECIMAL18">
             </field>
-            <field name="ListOfBigDecimal19" table="LIST_OF_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfBigDecimal19" column="LIST_OF_BIG_DECIMAL19">
             </field>
             <field name="ListOfBigDecimal20" table="LIST_OF_BIG_DECIMAL20">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfBigInteger21" table="LIST_OF_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfBigInteger21" column="LIST_OF_BIG_INTEGER21">
             </field>
-            <field name="ListOfBigInteger22" table="LIST_OF_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <element column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfBigInteger22" column="LIST_OF_BIG_INTEGER22">
             </field>
             <field name="ListOfBigInteger23" table="LIST_OF_BIG_INTEGER23">
                 <join column="IDENTIFIER"/>
                 <element column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfByte24" table="LIST_OF_BYTE24">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfByte24" column="LIST_OF_BYTE24">
             </field>
-            <field name="ListOfByte25" table="LIST_OF_BYTE25">
-                <join column="IDENTIFIER"/>
-                <element column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfByte25" column="LIST_OF_BYTE25">
             </field>
             <field name="ListOfByte26" table="LIST_OF_BYTE27">
                 <join column="IDENTIFIER"/>
                 <element column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfDouble27" table="LIST_OF_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfDouble27" column="LIST_OF_DOUBLE27">
             </field>
-            <field name="ListOfDouble28" table="LIST_OF_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <element column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfDouble28" column="LIST_OF_DOUBLE28">
             </field>
             <field name="ListOfDouble29" table="LIST_OF_DOUBLE29">
                 <join column="IDENTIFIER"/>
                 <element column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfFloat30" table="LIST_OF_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfFloat30" column="LIST_OF_FLOAT30">
             </field>
-            <field name="ListOfFloat31" table="LIST_OF_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <element column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfFloat31" column="LIST_OF_FLOAT31">
             </field>
             <field name="ListOfFloat32" table="LIST_OF_FLOAT32">
                 <join column="IDENTIFIER"/>
                 <element column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfInteger33" table="LIST_OF_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfInteger33" column="LIST_OF_INTEGER33">
             </field>
-            <field name="ListOfInteger34" table="LIST_OF_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <element column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfInteger34" column="LIST_OF_INTEGER34">
             </field>
             <field name="ListOfInteger35" table="LIST_OF_INTEGER35">
                 <join column="IDENTIFIER"/>
                 <element column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfLong36" table="LIST_OF_LONG36">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfLong36" column="LIST_OF_LONG36">
             </field>
-            <field name="ListOfLong37" table="LIST_OF_LONG37">
-                <join column="IDENTIFIER"/>
-                <element column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfLong37" column="LIST_OF_LONG37">
             </field>
             <field name="ListOfLong38" table="LIST_OF_LONG38">
                 <join column="IDENTIFIER"/>
                 <element column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ListOfShort39" table="LIST_OF_SHORT39">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfShort39" column="LIST_OF_SHORT39">
             </field>
-            <field name="ListOfShort40" table="LIST_OF_SHORT40">
-                <join column="IDENTIFIER"/>
-                <element column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="ListOfShort40" column="LIST_OF_SHORT40">
             </field>
             <field name="ListOfShort41" table="LIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=169373&r1=169372&r2=169373&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm Mon May  9 16:06:37 2005
@@ -46,215 +46,75 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_SimpleInterface7" table="MAP_OF_STRING_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_SimpleInterface7" column="MAP_OF_STRING_SIMPLE_INTERFACE7">
             </field>
-            <field name="MapOfString_SimpleInterface8" table="MAP_OF_STRING_SIMPLE_INTERFACE8">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SIMPINTREF"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_SimpleInterface8" column="MAP_OF_STRING_SIMPLE_INTERFACE8">
             </field>
-            <field name="MapOfString_String9" table="MAP_OF_STRING_STRING9">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String9" column="MAP_OF_STRING_STRING9">
             </field>
-            <field name="MapOfString_String10" table="MAP_OF_STRING_STRING10">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String10" column="MAP_OF_STRING_STRING10">
             </field>
-            <field name="MapOfString_String11" table="MAP_OF_STRING_STRING11">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String11" column="MAP_OF_STRING_STRING11">
             </field>
-            <field name="MapOfString_Date12" table="MAP_OF_STRING_DATE12">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date12" column="MAP_OF_STRING_DATE12">
             </field>
-            <field name="MapOfString_Date13" table="MAP_OF_STRING_DATE13">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date13" column="MAP_OF_STRING_DATE13">
             </field>
-            <field name="MapOfString_Date14" table="MAP_OF_STRING_DATE14">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date14" column="MAP_OF_STRING_DATE14">
             </field>
-            <field name="MapOfString_Locale15" table="MAP_OF_STRING_LOCALE15">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale15" column="MAP_OF_STRING_LOCALE15">
             </field>
-            <field name="MapOfString_Locale16" table="MAP_OF_STRING_LOCALE16">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale16" column="MAP_OF_STRING_LOCALE16">
             </field>
-            <field name="MapOfString_Locale17" table="MAP_OF_STRING_LOCALE17">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale17" column="MAP_OF_STRING_LOCALE17">
             </field>
-            <field name="MapOfString_BigDecimal18" table="MAP_OF_STRING_BIG_DECIMAL18">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal18" column="MAP_OF_STRING_BIG_DECIMAL18">
             </field>
-            <field name="MapOfString_BigDecimal19" table="MAP_OF_STRING_BIG_DECIMAL19">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal19" column="MAP_OF_STRING_BIG_DECIMAL19">
             </field>
-            <field name="MapOfString_BigDecimal20" table="MAP_OF_STRING_BIG_DECIMAL20">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal20" column="MAP_OF_STRING_BIG_DECIMAL20">
             </field>
-            <field name="MapOfString_BigInteger21" table="MAP_OF_STRING_BIG_INTEGER21">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger21" column="MAP_OF_STRING_BIG_INTEGER21">
             </field>
-            <field name="MapOfString_BigInteger22" table="MAP_OF_STRING_BIG_INTEGER22">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger22" column="MAP_OF_STRING_BIG_INTEGER22">
             </field>
-            <field name="MapOfString_BigInteger23" table="MAP_OF_STRING_BIG_INTEGER23">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger23" column="MAP_OF_STRING_BIG_INTEGER23">
             </field>
-            <field name="MapOfString_Byte24" table="MAP_OF_STRING_BYTE24">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte24" column="MAP_OF_STRING_BYTE24">
             </field>
-            <field name="MapOfString_Byte25" table="MAP_OF_STRING_BYTE25">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte25" column="MAP_OF_STRING_BYTE25">
             </field>
-            <field name="MapOfString_Byte26" table="MAP_OF_STRING_BYTE27">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte26" column="MAP_OF_STRING_BYTE27">
             </field>
-            <field name="MapOfString_Double27" table="MAP_OF_STRING_DOUBLE27">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double27" column="MAP_OF_STRING_DOUBLE27">
             </field>
-            <field name="MapOfString_Double28" table="MAP_OF_STRING_DOUBLE28">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double28" column="MAP_OF_STRING_DOUBLE28">
             </field>
-            <field name="MapOfString_Double29" table="MAP_OF_STRING_DOUBLE29">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double29" column="MAP_OF_STRING_DOUBLE29">
             </field>
-            <field name="MapOfString_Float30" table="MAP_OF_STRING_FLOAT30">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float30" column="MAP_OF_STRING_FLOAT30">
             </field>
-            <field name="MapOfString_Float31" table="MAP_OF_STRING_FLOAT31">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float31" column="MAP_OF_STRING_FLOAT31">
             </field>
-            <field name="MapOfString_Float32" table="MAP_OF_STRING_FLOAT32">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float32" column="MAP_OF_STRING_FLOAT32">
             </field>
-            <field name="MapOfString_Integer33" table="MAP_OF_STRING_INTEGER33">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer33" column="MAP_OF_STRING_INTEGER33">
             </field>
-            <field name="MapOfString_Integer34" table="MAP_OF_STRING_INTEGER34">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer34" column="MAP_OF_STRING_INTEGER34">
             </field>
-            <field name="MapOfString_Integer35" table="MAP_OF_STRING_INTEGER35">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer35" column="MAP_OF_STRING_INTEGER35">
             </field>
-            <field name="MapOfString_Long36" table="MAP_OF_STRING_LONG36">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long36" column="MAP_OF_STRING_LONG36">
             </field>
-            <field name="MapOfString_Long37" table="MAP_OF_STRING_LONG37">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long37" column="MAP_OF_STRING_LONG37">
             </field>
-            <field name="MapOfString_Long38" table="MAP_OF_STRING_LONG38">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long38" column="MAP_OF_STRING_LONG38">
             </field>
-            <field name="MapOfString_Short39" table="MAP_OF_STRING_SHORT39">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short39" column="MAP_OF_STRING_SHORT39">
             </field>
-            <field name="MapOfString_Short40" table="MAP_OF_STRING_SHORT40">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short40" column="MAP_OF_STRING_SHORT40">
             </field>
-            <field name="MapOfString_Short41" table="MAP_OF_STRING_SHORT41">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short41" column="MAP_OF_STRING_SHORT41">
             </field>
   <field name="MapOfString_Object42" table="MAP_OF_STRING_OBJECT42">
                 <join column="IDENTIFIER"/>
@@ -310,203 +170,71 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String51" table="MAP_OF_STRING_STRING51">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String51" column="MAP_OF_STRING_STRING51">
             </field>
-            <field name="MapOfString_String52" table="MAP_OF_STRING_STRING52">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String52" column="MAP_OF_STRING_STRING52">
             </field>
-            <field name="MapOfString_String53" table="MAP_OF_STRING_STRING53">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String53" column="MAP_OF_STRING_STRING53">
             </field>
-            <field name="MapOfString_Date54" table="MAP_OF_STRING_DATE54">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date54" column="MAP_OF_STRING_DATE54">
             </field>
-            <field name="MapOfString_Date55" table="MAP_OF_STRING_DATE55">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date55" column="MAP_OF_STRING_DATE55">
             </field>
-            <field name="MapOfString_Date56" table="MAP_OF_STRING_DATE56">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date56" column="MAP_OF_STRING_DATE56">
             </field>
-            <field name="MapOfString_Locale57" table="MAP_OF_STRING_LOCALE57">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale57" column="MAP_OF_STRING_LOCALE57">
             </field>
-            <field name="MapOfString_Locale58" table="MAP_OF_STRING_LOCALE58">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale58" column="MAP_OF_STRING_LOCALE58">
             </field>
-            <field name="MapOfString_Locale59" table="MAP_OF_STRING_LOCALE59">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale59" column="MAP_OF_STRING_LOCALE59">
             </field>
-            <field name="MapOfString_BigDecimal60" table="MAP_OF_STRING_BIG_DECIMAL60">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal60" column="MAP_OF_STRING_BIG_DECIMAL60">
             </field>
-            <field name="MapOfString_BigDecimal61" table="MAP_OF_STRING_BIG_DECIMAL61">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal61" column="MAP_OF_STRING_BIG_DECIMAL61">
             </field>
-            <field name="MapOfString_BigDecimal62" table="MAP_OF_STRING_BIG_DECIMAL62">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal62" column="MAP_OF_STRING_BIG_DECIMAL62">
             </field>
-            <field name="MapOfString_BigInteger63" table="MAP_OF_STRING_BIG_INTEGER63">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger63" column="MAP_OF_STRING_BIG_INTEGER63">
             </field>
-            <field name="MapOfString_BigInteger64" table="MAP_OF_STRING_BIG_INTEGER64">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger64" column="MAP_OF_STRING_BIG_INTEGER64">
             </field>
-            <field name="MapOfString_BigInteger65" table="MAP_OF_STRING_BIG_INTEGER65">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger65" column="MAP_OF_STRING_BIG_INTEGER65">
             </field>
-            <field name="MapOfString_Byte66" table="MAP_OF_STRING_BYTE66">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte66" column="MAP_OF_STRING_BYTE66">
             </field>
-            <field name="MapOfString_Byte67" table="MAP_OF_STRING_BYTE67">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte67" column="MAP_OF_STRING_BYTE67">
             </field>
-            <field name="MapOfString_Byte68" table="MAP_OF_STRING_BYTE68">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte68" column="MAP_OF_STRING_BYTE68">
             </field>
-            <field name="MapOfString_Double69" table="MAP_OF_STRING_DOUBLE69">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double69" column="MAP_OF_STRING_DOUBLE69">
             </field>
-            <field name="MapOfString_Double70" table="MAP_OF_STRING_DOUBLE70">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double70" column="MAP_OF_STRING_DOUBLE70">
             </field>
-            <field name="MapOfString_Double71" table="MAP_OF_STRING_DOUBLE71">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double71" column="MAP_OF_STRING_DOUBLE71">
             </field>
-            <field name="MapOfString_Float72" table="MAP_OF_STRING_FLOAT72">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float72" column="MAP_OF_STRING_FLOAT72">
             </field>
-            <field name="MapOfString_Float73" table="MAP_OF_STRING_FLOAT73">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float73" column="MAP_OF_STRING_FLOAT73">
             </field>
-            <field name="MapOfString_Float74" table="MAP_OF_STRING_FLOAT74">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float74" column="MAP_OF_STRING_FLOAT74">
             </field>
-            <field name="MapOfString_Integer75" table="MAP_OF_STRING_INTEGER75">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer75" column="MAP_OF_STRING_INTEGER75">
             </field>
-            <field name="MapOfString_Integer76" table="MAP_OF_STRING_INTEGER76">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer76" column="MAP_OF_STRING_INTEGER76">
             </field>
-            <field name="MapOfString_Integer77" table="MAP_OF_STRING_INTEGER77">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer77" column="MAP_OF_STRING_INTEGER77">
             </field>
-            <field name="MapOfString_Long78" table="MAP_OF_STRING_LONG78">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long78" column="MAP_OF_STRING_LONG78">
             </field>
-            <field name="MapOfString_Long79" table="MAP_OF_STRING_LONG79">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long79" column="MAP_OF_STRING_LONG79">
             </field>
-            <field name="MapOfString_Long80" table="MAP_OF_STRING_LONG80">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long80" column="MAP_OF_STRING_LONG80">
             </field>
-            <field name="MapOfString_Short81" table="MAP_OF_STRING_SHORT81">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short81" column="MAP_OF_STRING_SHORT81">
             </field>
-            <field name="MapOfString_Short82" table="MAP_OF_STRING_SHORT82">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short82" column="MAP_OF_STRING_SHORT82">
             </field>
-            <field name="MapOfString_Short83" table="MAP_OF_STRING_SHORT83">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short83" column="MAP_OF_STRING_SHORT83">
             </field>
             <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
                 <join column="IDENTIFIER"/>
@@ -562,17 +290,9 @@
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_String93" table="MAP_OF_STRING_STRING93">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String93" column="MAP_OF_STRING_STRING93">
             </field>
-            <field name="MapOfString_String94" table="MAP_OF_STRING_STRING94">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="STRINGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_String94" column="MAP_OF_STRING_STRING94">
             </field>
             <field name="MapOfString_String95" table="MAP_OF_STRING_STRING95">
                 <join column="IDENTIFIER"/>
@@ -580,17 +300,9 @@
                 <value column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Date96" table="MAP_OF_STRING_DATE96">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date96" column="MAP_OF_STRING_DATE96">
             </field>
-            <field name="MapOfString_Date97" table="MAP_OF_STRING_DATE97">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DATEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Date97" column="MAP_OF_STRING_DATE97">
             </field>
             <field name="MapOfString_Date98" table="MAP_OF_STRING_DATE98">
                 <join column="IDENTIFIER"/>
@@ -598,17 +310,9 @@
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Locale99" table="MAP_OF_STRING_LOCALE99">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale99" column="MAP_OF_STRING_LOCALE99">
             </field>
-            <field name="MapOfString_Locale100" table="MAP_OF_STRING_LOCALE100">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LOCALEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Locale100" column="MAP_OF_STRING_LOCALE100">
             </field>
             <field name="MapOfString_Locale101" table="MAP_OF_STRING_LOCALE101">
                 <join column="IDENTIFIER"/>
@@ -616,17 +320,9 @@
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigDecimal102" table="MAP_OF_STRING_BIG_DECIMAL102">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal102" column="MAP_OF_STRING_BIG_DECIMAL102">
             </field>
-            <field name="MapOfString_BigDecimal103" table="MAP_OF_STRING_BIG_DECIMAL103">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_DECIMALVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigDecimal103" column="MAP_OF_STRING_BIG_DECIMAL103">
             </field>
             <field name="MapOfString_BigDecimal104" table="MAP_OF_STRING_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
@@ -634,17 +330,9 @@
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_BigInteger105" table="MAP_OF_STRING_BIG_INTEGER105">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger105" column="MAP_OF_STRING_BIG_INTEGER105">
             </field>
-            <field name="MapOfString_BigInteger106" table="MAP_OF_STRING_BIG_INTEGER106">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BIG_INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_BigInteger106" column="MAP_OF_STRING_BIG_INTEGER106">
             </field>
             <field name="MapOfString_BigInteger107" table="MAP_OF_STRING_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
@@ -652,17 +340,9 @@
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Byte108" table="MAP_OF_STRING_BYTE108">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte108" column="MAP_OF_STRING_BYTE108">
             </field>
-            <field name="MapOfString_Byte109" table="MAP_OF_STRING_BYTE109">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="BYTEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Byte109" column="MAP_OF_STRING_BYTE109">
             </field>
             <field name="MapOfString_Byte110" table="MAP_OF_STRING_BYTE110">
                 <join column="IDENTIFIER"/>
@@ -670,17 +350,9 @@
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Double111" table="MAP_OF_STRING_DOUBLE111">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double111" column="MAP_OF_STRING_DOUBLE111">
             </field>
-            <field name="MapOfString_Double112" table="MAP_OF_STRING_DOUBLE112">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="DOUBLEVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Double112" column="MAP_OF_STRING_DOUBLE112">
             </field>
             <field name="MapOfString_Double113" table="MAP_OF_STRING_DOUBLE113">
                 <join column="IDENTIFIER"/>
@@ -688,17 +360,9 @@
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Float114" table="MAP_OF_STRING_FLOAT114">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float114" column="MAP_OF_STRING_FLOAT114">
             </field>
-            <field name="MapOfString_Float115" table="MAP_OF_STRING_FLOAT115">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="FLOATVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Float115" column="MAP_OF_STRING_FLOAT115">
             </field>
             <field name="MapOfString_Float116" table="MAP_OF_STRING_FLOAT116">
                 <join column="IDENTIFIER"/>
@@ -706,17 +370,9 @@
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Integer117" table="MAP_OF_STRING_INTEGER117">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer117" column="MAP_OF_STRING_INTEGER117">
             </field>
-            <field name="MapOfString_Integer118" table="MAP_OF_STRING_INTEGER118">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="INTEGERVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Integer118" column="MAP_OF_STRING_INTEGER118">
             </field>
             <field name="MapOfString_Integer119" table="MAP_OF_STRING_INTEGER119">
                 <join column="IDENTIFIER"/>
@@ -724,17 +380,9 @@
                 <value column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Long120" table="MAP_OF_STRING_LONG120">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long120" column="MAP_OF_STRING_LONG120">
             </field>
-            <field name="MapOfString_Long121" table="MAP_OF_STRING_LONG121">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="LONGVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Long121" column="MAP_OF_STRING_LONG121">
             </field>
             <field name="MapOfString_Long122" table="MAP_OF_STRING_LONG122">
                 <join column="IDENTIFIER"/>
@@ -742,17 +390,9 @@
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="MapOfString_Short123" table="MAP_OF_STRING_SHORT123">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short123" column="MAP_OF_STRING_SHORT123">
             </field>
-            <field name="MapOfString_Short124" table="MAP_OF_STRING_SHORT124">
-                <join column="IDENTIFIER"/>
-                <key column="STRING"/>
-                <value column="SHORTVAL"/>
-                <order column="INDEX"/>
+            <field name="MapOfString_Short124" column="MAP_OF_STRING_SHORT124">
             </field>
             <field name="MapOfString_Short125" table="MAP_OF_STRING_SHORT125">
                 <join column="IDENTIFIER"/>



Mime
View raw message