From jdo-commits-return-788-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Thu Aug 04 15:40:26 2005
Return-Path: <jdo-commits-return-788-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 51732 invoked from network); 4 Aug 2005 15:40:26 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 4 Aug 2005 15:40:26 -0000
Received: (qmail 70412 invoked by uid 500); 4 Aug 2005 15:40:25 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 70357 invoked by uid 99); 4 Aug 2005 15:40:24 -0000
X-ASF-Spam-Status: No, hits=-9.6 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_25_50
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Thu, 04 Aug 2005 08:40:13 -0700
Received: (qmail 51529 invoked by uid 65534); 4 Aug 2005 15:40:11 -0000
Message-ID: <20050804154011.51527.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r227413 [2/3] - in /incubator/jdo/trunk/tck20/test:
 orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
 orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/
 sql/derby/applicationidentity/
Date: Thu, 04 Aug 2005 15:40:07 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.3
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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=227413&r1=227412&r2=227413&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 Thu Aug  4 08:39:53 2005
@@ -8,127 +8,106 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String1" table="MAP_OF_OBJECT1_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String2" table="MAP_OF_OBJECT2_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String3" table="MAP_OF_OBJECT3_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String4" table="MAP_OF_OBJECT4_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String6" table="MAP_OF_OBJECT6_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfObject_String8" table="MAP_OF_OBJECT8_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String9" table="MAP_OF_SIMPLE_CLASS9_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String10" table="MAP_OF_SIMPLE_CLASS10_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String11" table="MAP_OF_SIMPLE_CLASS11_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String12" table="MAP_OF_SIMPLE_CLASS12_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String13" table="MAP_OF_SIMPLE_CLASS13_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String15" table="MAP_OF_SIMPLE_CLASS15_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleClass_String17" table="MAP_OF_SIMPLE_CLASS17_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String18" table="MAP_OF_SIMPLE_INTERFACE18_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String19" table="MAP_OF_SIMPLE_INTERFACE19_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String20" table="MAP_OF_SIMPLE_INTERFACE20_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String21" table="MAP_OF_SIMPLE_INTERFACE21_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String22" table="MAP_OF_SIMPLE_INTERFACE22_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String24" table="MAP_OF_SIMPLE_INTERFACE24_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfSimpleInterface_String26" table="MAP_OF_SIMPLE_INTERFACE26_STRING">
                 <join column="IDENTIFIER"/>
                 <key column="KEYREF"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfString_String27" column="MAP_OF_STRING27_STRING"
                    serialized="true">
@@ -152,7 +131,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfDate_String36" column="MAP_OF_DATE36_STRING"
                    serialized="true">
@@ -176,7 +154,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfBigDecimal_String45" column="MAP_OF_BIG_DECIMAL45_STRING"
                    serialized="true">
@@ -199,10 +176,9 @@
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
                 <join column="IDENTIFIER"/>
                 <key>
-                    <column name="KEYVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <column name="KEYVAL" jdbc-type="DECIMAL" length="17" scale="6"/>
                 </key>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING"
                    serialized="true">
@@ -226,7 +202,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfByte_String63" column="MAP_OF_BYTE63_STRING"
                    serialized="true">
@@ -250,7 +225,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfDouble_String72" column="MAP_OF_DOUBLE72_STRING"
                    serialized="true">
@@ -274,7 +248,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfFloat_String81" column="MAP_OF_FLOAT81_STRING"
                    serialized="true">
@@ -298,7 +271,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfInteger_String90" column="MAP_OF_INTEGER90_STRING"
                    serialized="true">
@@ -322,7 +294,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfLong_String99" column="MAP_OF_LONG99_STRING"
                    serialized="true">
@@ -346,7 +317,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="MapOfShort_String108" column="MAP_OF_SHORT108_STRING"
                    serialized="true">
@@ -370,7 +340,6 @@
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
                 <value column="VALUEVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

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=227413&r1=227412&r2=227413&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 Thu Aug  4 08:39:53 2005
@@ -7,52 +7,42 @@
             <field name="SetOfObject0" table="SET_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfObject1" table="SET_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfObject2" table="SET_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
                 <element column="OBJREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleClass3" table="SET_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleClass4" table="SET_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleClass5" table="SET_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPCLSREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleInterface6" table="SET_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleInterface7" table="SET_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfSimpleInterface8" table="SET_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
                 <element column="SIMPINTREF"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfString9" table="SET_OF_STRING9">
                 <join column="IDENTIFIER"/>
                 <element column="STRINGVAL"/>
-                <order column="INDEX"/>
             </field>
             <field name="SetOfString10" column="SET_OF_STRING10"
                    serialized="true">
@@ -60,12 +50,10 @@
             <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>
             <field name="SetOfDate13" column="SET_OF_DATE13"
                    serialized="true">
@@ -73,12 +61,10 @@
             <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>
             <field name="SetOfLocale16" column="SET_OF_LOCALE16"
                    serialized="true">
@@ -86,12 +72,10 @@
             <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>
             <field name="SetOfBigDecimal19" column="SET_OF_BIG_DECIMAL19"
                    serialized="true">
@@ -99,12 +83,10 @@
             <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>
             <field name="SetOfBigInteger22" column="SET_OF_BIG_INTEGER22"
                    serialized="true">
@@ -112,12 +94,10 @@
             <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>
             <field name="SetOfByte25" column="SET_OF_BYTE25"
                    serialized="true">
@@ -125,12 +105,10 @@
             <field name="SetOfByte26" table="SET_OF_BYTE26">
                 <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>
             <field name="SetOfDouble28" column="SET_OF_DOUBLE28"
                    serialized="true">
@@ -138,12 +116,10 @@
             <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>
             <field name="SetOfFloat31" column="SET_OF_FLOAT31"
                    serialized="true">
@@ -151,12 +127,10 @@
             <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>
             <field name="SetOfInteger34" column="SET_OF_INTEGER34"
                    serialized="true">
@@ -164,12 +138,10 @@
             <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>
             <field name="SetOfLong37" column="SET_OF_LONG37"
                    serialized="true">
@@ -177,12 +149,10 @@
             <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>
             <field name="SetOfShort40" column="SET_OF_SHORT40"
                    serialized="true">
@@ -190,7 +160,6 @@
             <field name="SetOfShort41" table="SET_OF_SHORT41">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
-                <order column="INDEX"/>
             </field>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -6,49 +6,57 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="TreeMapOfString_Object0" table="TREEMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_Object1" table="TREEMAP_STR_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_Object2" table="TREEMAP_STR_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass3" table="TREEMAP_STR_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass4" table="TREEMAP_STR_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass5" table="TREEMAP_STR_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface6" table="TREEMAP_STR_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfString_SimpleInterface7" column="TREEMAP_STR_SIMPLE_INTERFACE7">
+            <field name="TreeMapOfString_SimpleInterface7" table="TREEMAP_STR_SIMPLE_INTERFACE7">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
-            <field name="TreeMapOfString_SimpleInterface8" column="TREEMAP_STR_SIMPLE_INTERFACE8">
+            <field name="TreeMapOfString_SimpleInterface8" table="TREEMAP_STR_SIMPLE_INTERFACE8">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="SIMPINTREF"/>
+                <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_String9" column="TREEMAP_STR_STRING9">
             </field>
@@ -116,39 +124,39 @@
             </field>
             <field name="TreeMapOfString_Short41" column="TREEMAP_STR_SHORT41">
             </field>
-  <field name="TreeMapOfString_Object42" table="TREEMAP_STR_OBJECT42">
+            <field name="TreeMapOfString_Object42" table="TREEMAP_STR_OBJECT42">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_Object43" table="TREEMAP_STR_OBJECT43">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass45" table="TREEMAP_STR_SIMPLE_CLASS45">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass46" table="TREEMAP_STR_SIMPLE_CLASS46">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface48" table="TREEMAP_STR_SIMPLE_INTERFACE48">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface49" table="TREEMAP_STR_SIMPLE_INTERFACE49">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
@@ -198,37 +206,37 @@
             </field>
             <field name="TreeMapOfString_Object84" table="TREEMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_Object86" table="TREEMAP_STR_OBJECT86">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass87" table="TREEMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleClass89" table="TREEMAP_STR_SIMPLE_CLASS89">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface90" table="TREEMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface92" table="TREEMAP_STR_SIMPLE_INTERFACE92">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
@@ -236,7 +244,7 @@
             </field>
             <field name="TreeMapOfString_String95" table="TREEMAP_STR_STRING95">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="STRINGVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -244,7 +252,7 @@
             </field>
             <field name="TreeMapOfString_Date98" table="TREEMAP_STR_DATE98">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DATEVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -252,7 +260,7 @@
             </field>
             <field name="TreeMapOfString_Locale101" table="TREEMAP_STR_LOCALE101">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LOCALEVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -260,7 +268,7 @@
             </field>
             <field name="TreeMapOfString_BigDecimal104" table="TREEMAP_STR_BIG_DECIMAL104">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_DECIMALVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -268,7 +276,7 @@
             </field>
             <field name="TreeMapOfString_BigInteger107" table="TREEMAP_STR_BIG_INTEGER107">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BIG_INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -276,7 +284,7 @@
             </field>
             <field name="TreeMapOfString_Byte110" table="TREEMAP_STR_BYTE110">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="BYTEVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -284,7 +292,7 @@
             </field>
             <field name="TreeMapOfString_Double113" table="TREEMAP_STR_DOUBLE113">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="DOUBLEVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -292,7 +300,7 @@
             </field>
             <field name="TreeMapOfString_Float116" table="TREEMAP_STR_FLOAT116">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="FLOATVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -300,7 +308,7 @@
             </field>
             <field name="TreeMapOfString_Integer119" table="TREEMAP_STR_INTEGER119">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="INTEGERVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -308,7 +316,7 @@
             </field>
             <field name="TreeMapOfString_Long122" table="TREEMAP_STR_LONG122">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="LONGVAL"/>
                 <order column="INDEX"/>
             </field>
@@ -316,7 +324,7 @@
             </field>
             <field name="TreeMapOfString_Short125" table="TREEMAP_STR_SHORT125">
                 <join column="IDENTIFIER"/>
-                <key column="STRING"/>
+                <key column="KEYVAL"/>
                 <value column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Thu Aug  4 08:39:53 2005
@@ -6,128 +6,128 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="TreeMapOfObject_String0" table="TREEMAP_OBJECT0_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String1" table="TREEMAP_OBJECT1_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String2" table="TREEMAP_OBJECT2_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String3" table="TREEMAP_OBJECT3_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String4" table="TREEMAP_OBJECT4_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String6" table="TREEMAP_OBJECT6_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfObject_String8" table="TREEMAP_OBJECT8_STR">
                 <join column="IDENTIFIER"/>
-                <key column="OBJREF"/>
-                <value column="STRING"/>
+                <key column="KEYREF"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String9" table="TREEMAP_SIMPLE_CLASS9_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String10" table="TREEMAP_SIMPLE_CLASS10_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String11" table="TREEMAP_SIMPLE_CLASS11_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String12" table="TREEMAP_SIMPLE_CLASS12_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String13" table="TREEMAP_SIMPLE_CLASS13_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String15" table="TREEMAP_SIMPLE_CLASS15_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleClass_String17" table="TREEMAP_SIMPLE_CLASS17_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPCLSREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String18" table="TREEMAP_SIMPLE_INTERFACE18_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String19" table="TREEMAP_SIMPLE_INTERFACE19_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String20" table="TREEMAP_SIMPLE_INTERFACE20_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String21" table="TREEMAP_SIMPLE_INTERFACE21_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String22" table="TREEMAP_SIMPLE_INTERFACE22_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String24" table="TREEMAP_SIMPLE_INTERFACE24_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfSimpleInterface_String26" table="TREEMAP_SIMPLE_INTERFACE26_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SIMPINTREF"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfString_String27" column="TREEMAP_STRING27_STR">
@@ -145,7 +145,7 @@
             <field name="TreeMapOfString_String35" table="TREEMAP_STRING35_STR">
                 <join column="IDENTIFIER"/>
                 <key column="STRINGVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfDate_String36" column="TREEMAP_DATE36_STR">
@@ -163,7 +163,7 @@
             <field name="TreeMapOfDate_String44" table="TREEMAP_DATE44_STR">
                 <join column="IDENTIFIER"/>
                 <key column="DATEVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfBigDecimal_String45" column="TREEMAP_BIG_DECIMAL45_STR">
@@ -181,9 +181,9 @@
             <field name="TreeMapOfBigDecimal_String53" table="TREEMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <key>
-                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                    <column name="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="17" scale="6"/>
                 </key>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfBigInteger_String54" column="TREEMAP_BIG_INTEGER54_STR">
@@ -201,7 +201,7 @@
             <field name="TreeMapOfBigInteger_String62" table="TREEMAP_BIG_INTEGER62_STR">
                 <join column="IDENTIFIER"/>
                 <key column="BIG_INTEGERVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfByte_String63" column="TREEMAP_BYTE63_STR">
@@ -219,7 +219,7 @@
             <field name="TreeMapOfByte_String71" table="TREEMAP_BYTE71_STR">
                 <join column="IDENTIFIER"/>
                 <key column="BYTEVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfDouble_String72" column="TREEMAP_DOUBLE72_STR">
@@ -237,7 +237,7 @@
             <field name="TreeMapOfDouble_String80" table="TREEMAP_DOUBLE80_STR">
                 <join column="IDENTIFIER"/>
                 <key column="DOUBLEVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfFloat_String81" column="TREEMAP_FLOAT81_STR">
@@ -255,7 +255,7 @@
             <field name="TreeMapOfFloat_String89" table="TREEMAP_FLOAT89_STR">
                 <join column="IDENTIFIER"/>
                 <key column="FLOATVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfInteger_String90" column="TREEMAP_INTEGER90_STR">
@@ -273,7 +273,7 @@
             <field name="TreeMapOfInteger_String98" table="TREEMAP_INTEGER98_STR">
                 <join column="IDENTIFIER"/>
                 <key column="INTEGERVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfLong_String99" column="TREEMAP_LONG99_STR">
@@ -291,7 +291,7 @@
             <field name="TreeMapOfLong_String107" table="TREEMAP_LONG107_STR">
                 <join column="IDENTIFIER"/>
                 <key column="LONGVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfShort_String108" column="TREEMAP_SHORT108_STR">
@@ -309,7 +309,7 @@
             <field name="TreeMapOfShort_String116" table="TREEMAP_SHORT116_STR">
                 <join column="IDENTIFIER"/>
                 <key column="SHORTVAL"/>
-                <value column="STRING"/>
+                <value column="VALUEVAL"/>
                 <order column="INDEX"/>
             </field>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm?rev=227413&r1=227412&r2=227413&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/singlefieldidentity/package-derby.orm Thu Aug  4 08:39:53 2005
@@ -16,13 +16,17 @@
     </class>
 
     <class name="PCPointSingleFieldPrimitivechar" table="PCPointSingleFieldChar">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" primary-key="true">
+        <column name="ID" jdbc-type="INTEGER"/>
+      </field>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>
 
     <class name="PCPointSingleFieldCharacter" table="PCPointSingleFieldChar">
-      <field name="id" column="ID" primary-key="true"/>
+      <field name="id" primary-key="true">
+        <column name="ID" jdbc-type="INTEGER"/>
+      </field>
       <field name="x" column="X"/>
       <field name="y" column="Y"/>
     </class>