db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r240350 - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/...
Date Fri, 26 Aug 2005 21:40:47 GMT
Author: clr
Date: Fri Aug 26 14:40:40 2005
New Revision: 240350

URL: http://svn.apache.org/viewcvs?rev=240350&view=rev
Log:
Updated mapping for serialized and embedded Object, SimpleClass, and SimpleInterface

Modified:
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo?rev=240350&r1=240349&r2=240350&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
Fri Aug 26 14:40:40 2005
@@ -14,9 +14,8 @@
 </collection>
 </field>
 <field name="CollectionOfObject2" >
-  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -27,9 +26,8 @@
 </collection>
 </field>
 <field name="CollectionOfSimpleClass5" >
-  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
@@ -45,9 +43,8 @@
 </field>
 <field name="CollectionOfSimpleInterface8">
   <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
-              embedded-element="false">
+              serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfString9" >
 <collection element-type="java.lang.String">

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo?rev=240350&r1=240349&r2=240350&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections.jdo
Fri Aug 26 14:40:40 2005
@@ -12,9 +12,8 @@
 </collection>
 </field>
 <field name="CollectionOfObject2" >
-  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass3" >
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass">
@@ -25,9 +24,8 @@
 </collection>
 </field>
 <field name="CollectionOfSimpleClass5" >
-  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
+  <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfSimpleClass42" serialized="true">
 <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass" embedded-element="false">
@@ -43,9 +41,8 @@
 </field>
 <field name="CollectionOfSimpleInterface8">
   <collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleClass"
-              embedded-element="false">
+              serialized-element="true">
   </collection>
-  <element serialized="true" />
 </field>
 <field name="CollectionOfString9" >
 <collection element-type="java.lang.String">

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=240350&r1=240349&r2=240350&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
Fri Aug 26 14:40:40 2005
@@ -19,6 +19,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfObject2"
                    table="COLLECTION_OF_OBJECT2">
@@ -40,6 +41,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass5"
                    table="COLLECTION_OF_SIMPLE_CLASS5">
@@ -64,6 +66,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleInterface8"
                    table="COLLECTION_OF_SIMPLE_INTERFACE8">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=240350&r1=240349&r2=240350&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
Fri Aug 26 14:40:40 2005
@@ -20,6 +20,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfObject2"
                    table="COLLECTION_OF_OBJECT2">
@@ -41,6 +42,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleClass5"
                    table="COLLECTION_OF_SIMPLE_CLASS5">
@@ -65,6 +67,7 @@
                     <field name="stringField" column="STRINGVAL"/>
                   </embedded>
                 </element>
+                <order column="ALLOW_DUPLICATES"/>
             </field>
             <field name="CollectionOfSimpleInterface8"
                    table="COLLECTION_OF_SIMPLE_INTERFACE8">

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=240350&r1=240349&r2=240350&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Fri Aug 26 14:40:40
2005
@@ -2882,6 +2882,7 @@
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -2902,6 +2903,7 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -2922,6 +2924,7 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=240350&r1=240349&r2=240350&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Fri Aug 26 14:40:40
2005
@@ -2858,6 +2858,7 @@
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -2878,6 +2879,7 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL
@@ -2898,6 +2900,7 @@
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
+    ALLOW_DUPLICATES BIGINT NOT NULL,
     ID BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL



Mime
View raw message