You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/07/19 22:06:11 UTC
svn commit: r219769 - in /incubator/jdo/trunk/tck20/test:
orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Author: mcaisse
Date: Tue Jul 19 13:06:10 2005
New Revision: 219769
URL: http://svn.apache.org/viewcvs?rev=219769&view=rev
Log:
JDO-85 Mapping problem fixed, but errors remain
Modified:
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-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/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm?rev=219769&r1=219768&r2=219769&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm Tue Jul 19 13:06:10 2005
@@ -4,10 +4,12 @@
<package name="org.apache.jdo.tck.pc.fieldtypes">
<class name="FieldsOfObject" table="FIELDSOFOBJECT">
<field name="identifier" primary-key="true" column="IDENTIFIER"/>
+ <field name="Object0" column="OBJECT0"/>
<field name="Object1" column="OBJECT1"/>
<field name="Object102" column="OBJECT102"/>
<field name="Object103" column="OBJECT103"/>
<field name="Object104" column="OBJECT104"/>
+ <field name="Object108" column="OBJECT108"/>
<field name="Object109" column="OBJECT109"/>
<field name="Object11" column="OBJECT11"/>
<field name="Object110" column="OBJECT110"/>
@@ -18,6 +20,7 @@
<field name="Object12" column="OBJECT12"/>
<field name="Object120" column="OBJECT120"/>
<field name="Object121" column="OBJECT121"/>
+ <field name="Object124" column="OBJECT124"/>
<field name="Object125" column="OBJECT125"/>
<field name="Object126" column="OBJECT126"/>
<field name="Object128" column="OBJECT128"/>
@@ -27,6 +30,7 @@
<field name="Object138" column="OBJECT138"/>
<field name="Object139" column="OBJECT139"/>
<field name="Object140" column="OBJECT140"/>
+ <field name="Object16" column="OBJECT16"/>
<field name="Object17" column="OBJECT17"/>
<field name="Object18" column="OBJECT18"/>
<field name="Object2" column="OBJECT2"/>
@@ -36,6 +40,7 @@
<field name="Object30" column="OBJECT30"/>
<field name="Object31" column="OBJECT31"/>
<field name="Object32" column="OBJECT32"/>
+ <field name="Object36" column="OBJECT36"/>
<field name="Object37" column="OBJECT37"/>
<field name="Object38" column="OBJECT38"/>
<field name="Object4" column="OBJECT4"/>
@@ -46,6 +51,7 @@
<field name="Object48" column="OBJECT48"/>
<field name="Object49" column="OBJECT49"/>
<field name="Object5" column="OBJECT5"/>
+ <field name="Object52" column="OBJECT52"/>
<field name="Object53" column="OBJECT53"/>
<field name="Object54" column="OBJECT54"/>
<field name="Object56" column="OBJECT56"/>
@@ -55,6 +61,7 @@
<field name="Object66" column="OBJECT66"/>
<field name="Object67" column="OBJECT67"/>
<field name="Object68" column="OBJECT68"/>
+ <field name="Object72" column="OBJECT72"/>
<field name="Object73" column="OBJECT73"/>
<field name="Object74" column="OBJECT74"/>
<field name="Object76" column="OBJECT76"/>
@@ -63,6 +70,7 @@
<field name="Object83" column="OBJECT83"/>
<field name="Object84" column="OBJECT84"/>
<field name="Object85" column="OBJECT85"/>
+ <field name="Object88" column="OBJECT88"/>
<field name="Object89" column="OBJECT89"/>
<field name="Object90" column="OBJECT90"/>
<field name="Object92" column="OBJECT92"/>
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm?rev=219769&r1=219768&r2=219769&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfObject-derby.orm Tue Jul 19 13:06:10 2005
@@ -5,10 +5,12 @@
<class name="FieldsOfObject" table="FIELDSOFOBJECT">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
+ <field name="Object0" column="OBJECT0"/>
<field name="Object1" column="OBJECT1"/>
<field name="Object102" column="OBJECT102"/>
<field name="Object103" column="OBJECT103"/>
<field name="Object104" column="OBJECT104"/>
+ <field name="Object108" column="OBJECT108"/>
<field name="Object109" column="OBJECT109"/>
<field name="Object11" column="OBJECT11"/>
<field name="Object110" column="OBJECT110"/>
@@ -19,6 +21,7 @@
<field name="Object12" column="OBJECT12"/>
<field name="Object120" column="OBJECT120"/>
<field name="Object121" column="OBJECT121"/>
+ <field name="Object124" column="OBJECT124"/>
<field name="Object125" column="OBJECT125"/>
<field name="Object126" column="OBJECT126"/>
<field name="Object128" column="OBJECT128"/>
@@ -28,6 +31,7 @@
<field name="Object138" column="OBJECT138"/>
<field name="Object139" column="OBJECT139"/>
<field name="Object140" column="OBJECT140"/>
+ <field name="Object16" column="OBJECT16"/>
<field name="Object17" column="OBJECT17"/>
<field name="Object18" column="OBJECT18"/>
<field name="Object2" column="OBJECT2"/>
@@ -37,6 +41,7 @@
<field name="Object30" column="OBJECT30"/>
<field name="Object31" column="OBJECT31"/>
<field name="Object32" column="OBJECT32"/>
+ <field name="Object36" column="OBJECT36"/>
<field name="Object37" column="OBJECT37"/>
<field name="Object38" column="OBJECT38"/>
<field name="Object4" column="OBJECT4"/>
@@ -47,6 +52,7 @@
<field name="Object48" column="OBJECT48"/>
<field name="Object49" column="OBJECT49"/>
<field name="Object5" column="OBJECT5"/>
+ <field name="Object52" column="OBJECT52"/>
<field name="Object53" column="OBJECT53"/>
<field name="Object54" column="OBJECT54"/>
<field name="Object56" column="OBJECT56"/>
@@ -56,6 +62,7 @@
<field name="Object66" column="OBJECT66"/>
<field name="Object67" column="OBJECT67"/>
<field name="Object68" column="OBJECT68"/>
+ <field name="Object72" column="OBJECT72"/>
<field name="Object73" column="OBJECT73"/>
<field name="Object74" column="OBJECT74"/>
<field name="Object76" column="OBJECT76"/>
@@ -64,6 +71,7 @@
<field name="Object83" column="OBJECT83"/>
<field name="Object84" column="OBJECT84"/>
<field name="Object85" column="OBJECT85"/>
+ <field name="Object88" column="OBJECT88"/>
<field name="Object89" column="OBJECT89"/>
<field name="Object90" column="OBJECT90"/>
<field name="Object92" column="OBJECT92"/>
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=219769&r1=219768&r2=219769&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Tue Jul 19 13:06:10 2005
@@ -1667,10 +1667,12 @@
CREATE TABLE FIELDSOFOBJECT
(
IDENTIFIER INTEGER NOT NULL,
+ OBJECT0 LONG VARCHAR FOR BIT DATA,
OBJECT1 LONG VARCHAR FOR BIT DATA,
OBJECT102 LONG VARCHAR FOR BIT DATA,
OBJECT103 LONG VARCHAR FOR BIT DATA,
OBJECT104 LONG VARCHAR FOR BIT DATA,
+ OBJECT108 LONG VARCHAR FOR BIT DATA,
OBJECT109 LONG VARCHAR FOR BIT DATA,
OBJECT11 LONG VARCHAR FOR BIT DATA,
OBJECT110 LONG VARCHAR FOR BIT DATA,
@@ -1681,6 +1683,7 @@
OBJECT12 LONG VARCHAR FOR BIT DATA,
OBJECT120 LONG VARCHAR FOR BIT DATA,
OBJECT121 LONG VARCHAR FOR BIT DATA,
+ OBJECT124 LONG VARCHAR FOR BIT DATA,
OBJECT125 LONG VARCHAR FOR BIT DATA,
OBJECT126 LONG VARCHAR FOR BIT DATA,
OBJECT128 LONG VARCHAR FOR BIT DATA,
@@ -1690,6 +1693,7 @@
OBJECT138 LONG VARCHAR FOR BIT DATA,
OBJECT139 LONG VARCHAR FOR BIT DATA,
OBJECT140 LONG VARCHAR FOR BIT DATA,
+ OBJECT16 LONG VARCHAR FOR BIT DATA,
OBJECT17 LONG VARCHAR FOR BIT DATA,
OBJECT18 LONG VARCHAR FOR BIT DATA,
OBJECT2 LONG VARCHAR FOR BIT DATA,
@@ -1699,6 +1703,7 @@
OBJECT30 LONG VARCHAR FOR BIT DATA,
OBJECT31 LONG VARCHAR FOR BIT DATA,
OBJECT32 LONG VARCHAR FOR BIT DATA,
+ OBJECT36 LONG VARCHAR FOR BIT DATA,
OBJECT37 LONG VARCHAR FOR BIT DATA,
OBJECT38 LONG VARCHAR FOR BIT DATA,
OBJECT4 LONG VARCHAR FOR BIT DATA,
@@ -1709,6 +1714,7 @@
OBJECT48 LONG VARCHAR FOR BIT DATA,
OBJECT49 LONG VARCHAR FOR BIT DATA,
OBJECT5 LONG VARCHAR FOR BIT DATA,
+ OBJECT52 LONG VARCHAR FOR BIT DATA,
OBJECT53 LONG VARCHAR FOR BIT DATA,
OBJECT54 LONG VARCHAR FOR BIT DATA,
OBJECT56 LONG VARCHAR FOR BIT DATA,
@@ -1718,6 +1724,7 @@
OBJECT66 LONG VARCHAR FOR BIT DATA,
OBJECT67 LONG VARCHAR FOR BIT DATA,
OBJECT68 LONG VARCHAR FOR BIT DATA,
+ OBJECT72 LONG VARCHAR FOR BIT DATA,
OBJECT73 LONG VARCHAR FOR BIT DATA,
OBJECT74 LONG VARCHAR FOR BIT DATA,
OBJECT76 LONG VARCHAR FOR BIT DATA,
@@ -1726,6 +1733,7 @@
OBJECT83 LONG VARCHAR FOR BIT DATA,
OBJECT84 LONG VARCHAR FOR BIT DATA,
OBJECT85 LONG VARCHAR FOR BIT DATA,
+ OBJECT88 LONG VARCHAR FOR BIT DATA,
OBJECT89 LONG VARCHAR FOR BIT DATA,
OBJECT90 LONG VARCHAR FOR BIT DATA,
OBJECT92 LONG VARCHAR FOR BIT DATA,
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=219769&r1=219768&r2=219769&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Tue Jul 19 13:06:10 2005
@@ -1627,10 +1627,12 @@
(
DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
IDENTIFIER INTEGER,
+ OBJECT0 LONG VARCHAR FOR BIT DATA,
OBJECT1 LONG VARCHAR FOR BIT DATA,
OBJECT102 LONG VARCHAR FOR BIT DATA,
OBJECT103 LONG VARCHAR FOR BIT DATA,
OBJECT104 LONG VARCHAR FOR BIT DATA,
+ OBJECT108 LONG VARCHAR FOR BIT DATA,
OBJECT109 LONG VARCHAR FOR BIT DATA,
OBJECT11 LONG VARCHAR FOR BIT DATA,
OBJECT110 LONG VARCHAR FOR BIT DATA,
@@ -1641,6 +1643,7 @@
OBJECT12 LONG VARCHAR FOR BIT DATA,
OBJECT120 LONG VARCHAR FOR BIT DATA,
OBJECT121 LONG VARCHAR FOR BIT DATA,
+ OBJECT124 LONG VARCHAR FOR BIT DATA,
OBJECT125 LONG VARCHAR FOR BIT DATA,
OBJECT126 LONG VARCHAR FOR BIT DATA,
OBJECT128 LONG VARCHAR FOR BIT DATA,
@@ -1650,6 +1653,7 @@
OBJECT138 LONG VARCHAR FOR BIT DATA,
OBJECT139 LONG VARCHAR FOR BIT DATA,
OBJECT140 LONG VARCHAR FOR BIT DATA,
+ OBJECT16 LONG VARCHAR FOR BIT DATA,
OBJECT17 LONG VARCHAR FOR BIT DATA,
OBJECT18 LONG VARCHAR FOR BIT DATA,
OBJECT2 LONG VARCHAR FOR BIT DATA,
@@ -1659,6 +1663,7 @@
OBJECT30 LONG VARCHAR FOR BIT DATA,
OBJECT31 LONG VARCHAR FOR BIT DATA,
OBJECT32 LONG VARCHAR FOR BIT DATA,
+ OBJECT36 LONG VARCHAR FOR BIT DATA,
OBJECT37 LONG VARCHAR FOR BIT DATA,
OBJECT38 LONG VARCHAR FOR BIT DATA,
OBJECT4 LONG VARCHAR FOR BIT DATA,
@@ -1669,6 +1674,7 @@
OBJECT48 LONG VARCHAR FOR BIT DATA,
OBJECT49 LONG VARCHAR FOR BIT DATA,
OBJECT5 LONG VARCHAR FOR BIT DATA,
+ OBJECT52 LONG VARCHAR FOR BIT DATA,
OBJECT53 LONG VARCHAR FOR BIT DATA,
OBJECT54 LONG VARCHAR FOR BIT DATA,
OBJECT56 LONG VARCHAR FOR BIT DATA,
@@ -1678,6 +1684,7 @@
OBJECT66 LONG VARCHAR FOR BIT DATA,
OBJECT67 LONG VARCHAR FOR BIT DATA,
OBJECT68 LONG VARCHAR FOR BIT DATA,
+ OBJECT72 LONG VARCHAR FOR BIT DATA,
OBJECT73 LONG VARCHAR FOR BIT DATA,
OBJECT74 LONG VARCHAR FOR BIT DATA,
OBJECT76 LONG VARCHAR FOR BIT DATA,
@@ -1686,6 +1693,7 @@
OBJECT83 LONG VARCHAR FOR BIT DATA,
OBJECT84 LONG VARCHAR FOR BIT DATA,
OBJECT85 LONG VARCHAR FOR BIT DATA,
+ OBJECT88 LONG VARCHAR FOR BIT DATA,
OBJECT89 LONG VARCHAR FOR BIT DATA,
OBJECT90 LONG VARCHAR FOR BIT DATA,
OBJECT92 LONG VARCHAR FOR BIT DATA,