db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r357130 - in /incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes: HashSetCollections-derby.orm SetCollections-derby.orm
Date Fri, 16 Dec 2005 05:59:13 GMT
Author: mcaisse
Date: Thu Dec 15 21:59:11 2005
New Revision: 357130

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

Modified:
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm?rev=357130&r1=357129&r2=357130&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashSetCollections-derby.orm
Thu Dec 15 21:59:11 2005
@@ -12,10 +12,15 @@
             </field>
             <field name="HashSetOfObject1"
                    table="HASHSET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
@@ -33,10 +38,15 @@
             </field>
             <field name="HashSetOfSimpleClass4"
                    table="HASHSET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
@@ -57,10 +67,15 @@
             </field>
             <field name="HashSetOfSimpleInterface7"
                    table="HASHSET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm?rev=357130&r1=357129&r2=357130&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/SetCollections-derby.orm
Thu Dec 15 21:59:11 2005
@@ -12,10 +12,15 @@
             </field>
             <field name="SetOfObject1"
                    table="SET_OF_OBJECT1">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
@@ -33,10 +38,15 @@
             </field>
             <field name="SetOfSimpleClass4"
                    table="SET_OF_SIMPLE_CLASS4">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
@@ -57,10 +67,15 @@
             </field>
             <field name="SetOfSimpleInterface7"
                    table="SET_OF_SIMPLE_INTERFACE7">
-                <join column="IDENTIFIER"/>
+                <join column="IDENTIFIER">
+                    <primary-key>
+                        <column name="IDENTIFIER"/>
+                        <column name="ID"/>
+                    </primary-key>
+                </join>
                 <element>
                   <embedded>
-                    <field name="id" primary-key="true" column="ID"/>
+                    <field name="id" column="ID"/>
                     <field name="intField" column="INTVAL"/>
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>



Mime
View raw message