db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r216049 - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/company/ orm/applicationidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ sql/derby/applicationidentity/ ...
Date Wed, 13 Jul 2005 00:15:29 GMT
Author: mcaisse
Date: Tue Jul 12 17:15:26 2005
New Revision: 216049

URL: http://svn.apache.org/viewcvs?rev=216049&view=rev
Log:
JDO-83 Persist application field addrid

Modified:
    incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-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/company/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
(original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
Tue Jul 12 17:15:26 2005
@@ -7,9 +7,7 @@
 <jdo>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address" requires-extent="false">
-            <field name="addrid" persistence-modifier="none"/>
-        </class>
+        <class name="Address" requires-extent="false"/>
 
         <class name="Company"
             identity-type="application"

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Tue Jul 12 17:15:26 2005
@@ -7,20 +7,13 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address">
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
-        </class>
-
         <class name="Company" table="companies">
             <field name="companyid" column="ID" primary-key="true"/>
             <field name="name" column="NAME"/>
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>
@@ -88,6 +81,7 @@
             <field name="middlename" column="MIDDLENAME"/>
             <field name="address">
                 <embedded>
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=216049&r1=216048&r2=216049&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
Tue Jul 12 17:15:26 2005
@@ -7,14 +7,6 @@
 <orm>
     <package name="org.apache.jdo.tck.pc.company">
 
-        <class name="Address">
-            <field name="street"/>
-            <field name="city"/>
-            <field name="state"/>
-            <field name="zipcode"/>
-            <field name="country"/>
-        </class>
-
         <class name="Company" table="companies">
             <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
             <field name="companyid" column="ID"/>
@@ -22,6 +14,7 @@
             <field name="founded" column="FOUNDEDDATE"/>
             <field name="address">
                 <embedded null-indicator-column="COUNTRY">
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>
@@ -91,6 +84,7 @@
             <field name="middlename" column="MIDDLENAME"/>
             <field name="address">
                 <embedded>
+                    <field name="addrid" column="ADDRID"/>
                     <field name="street" column="STREET"/>
                     <field name="city" column="CITY"/>
                     <field name="state" column="STATE"/>

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=216049&r1=216048&r2=216049&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 12 17:15:26
2005
@@ -79,6 +79,7 @@
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
@@ -101,6 +102,7 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),

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=216049&r1=216048&r2=216049&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 12 17:15:26
2005
@@ -84,6 +84,7 @@
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
@@ -108,6 +109,7 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
+    ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),



Mime
View raw message