db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r164492 - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/company/ orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/ orm/applicationidentity/org/apache/jdo/tck/pc/mylib/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/ sql/derby/
Date Sun, 24 Apr 2005 18:17:06 GMT
Author: mcaisse
Date: Sun Apr 24 11:17:04 2005
New Revision: 164492

URL: http://svn.apache.org/viewcvs?rev=164492&view=rev
Log:
JDO_30 Add foreign keys to PCRect; Also add foreign key tags to .orm

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql

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=164492&r1=164491&r2=164492&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
Sun Apr 24 11:17:04 2005
@@ -34,7 +34,7 @@
         <class name="Department" table="departments">
             <field name="deptid" column="ID" primary-key="true"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID"/>
+            <field name="company" column="COMPANYID" foreign-key="true"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
Sun Apr 24 11:17:04 2005
@@ -19,8 +19,8 @@
         <class name="AllPersist3">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="AllPersist4">
@@ -45,8 +45,8 @@
         <class name="TopNonPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="TopNonPersistH">
@@ -71,8 +71,8 @@
         <class name="TopPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="TopPersistH">
@@ -97,8 +97,8 @@
         <class name="FieldSameName3">
             <inheritance strategy="superclass-table"/>
             <field name="n1" column="FSN3_N1"/>
-            <field name="n2" column="FSN3_N2"/>
-            <field name="n3" column="FSN3_N3"/>
+            <field name="n2" column="FSN3_N2" foreign-key="true"/>
+            <field name="n3" column="FSN3_N3" foreign-key="true"/>
         </class>
 
         <class name="FieldSameName4">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
Sun Apr 24 11:17:04 2005
@@ -17,8 +17,8 @@
 
     <class name="PCRect" table="PCRect">
       <field name="id" column="ID" primary-key="true"/>
-      <field name="lowerRight" column="LOWER_RIGHT"/>
-      <field name="upperLeft" column="UPPER_LEFT"/>
+      <field name="lowerRight" column="LOWER_RIGHT" foreign-key="true"/>
+      <field name="upperLeft" column="UPPER_LEFT" foreign-key="true"/>
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">

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=164492&r1=164491&r2=164492&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
Sun Apr 24 11:17:04 2005
@@ -34,7 +34,7 @@
         <class name="Department" table="departments">
             <datastore-identity strategy="identity" column="ID"/>
             <field name="name" column="NAME"/>
-            <field name="company" column="COMPANYID"/>
+            <field name="company" column="COMPANYID" foreign-key="true"/>
             <field name="employees" mapped-by="department"/>
             <field name="fundedEmps" mapped-by="fundingDept"/>
             <field name="employeeOfTheMonth" column="EMP_OF_THE_MONTH"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/package-derby.orm
Sun Apr 24 11:17:04 2005
@@ -19,8 +19,8 @@
         <class name="AllPersist3">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="AllPersist4">
@@ -45,8 +45,8 @@
         <class name="TopNonPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="TopNonPersistH">
@@ -71,8 +71,8 @@
         <class name="TopPersistF">
             <inheritance strategy="superclass-table"/>
             <field name="shortF" column="SHORT_F"/>
-            <field name="secondObj" column="SECOND_OBJ"/>
-            <field name="thirdObj" column="THIRD_OBJ"/>
+            <field name="secondObj" column="SECOND_OBJ" foreign-key="true"/>
+            <field name="thirdObj" column="THIRD_OBJ" foreign-key="true"/>
         </class>
 
         <class name="TopPersistH">
@@ -97,8 +97,8 @@
         <class name="FieldSameName3">
             <inheritance strategy="superclass-table"/>
             <field name="n1" column="FSN3_N1"/>
-            <field name="n2" column="FSN3_N2"/>
-            <field name="n3" column="FSN3_N3"/>
+            <field name="n2" column="FSN3_N2" foreign-key="true"/>
+            <field name="n3" column="FSN3_N3" foreign-key="true"/>
         </class>
 
         <class name="FieldSameName4">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/package-derby.orm
Sun Apr 24 11:17:04 2005
@@ -17,8 +17,8 @@
 
     <class name="PCRect" table="PCRect">
       <datastore-identity strategy="identity" column="ID"/>
-      <field name="lowerRight" column="LOWER_RIGHT"/>
-      <field name="upperLeft" column="UPPER_LEFT"/>
+      <field name="lowerRight" column="LOWER_RIGHT" foreign-key="true"/>
+      <field name="upperLeft" column="UPPER_LEFT" foreign-key="true"/>
     </class>
 
     <class name="PrimitiveTypes" table="PrimitiveTypes">

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Sun Apr 24 11:17:04 2005
@@ -27,8 +27,8 @@
 
 CREATE TABLE PCRect (
     ID BIGINT NOT NULL,
-    UPPER_LEFT BIGINT NOT NULL,
-    LOWER_RIGHT BIGINT NOT NULL,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERECES PCPoint NOT NULL,
     CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
 );
 

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=164492&r1=164491&r2=164492&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Sun Apr 24 11:17:04 2005
@@ -27,8 +27,8 @@
 
 CREATE TABLE PCRect (
     ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
-    UPPER_LEFT BIGINT NOT NULL,
-    LOWER_RIGHT BIGINT NOT NULL,
+    UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
+    LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
     CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
 );
 



Mime
View raw message