Return-Path: 
 <jdo-commits-return-426-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 86150 invoked from network); 21 Apr 2005 16:41:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 21 Apr 2005 16:41:14 -0000
Received: (qmail 53462 invoked by uid 500); 21 Apr 2005 16:41:30 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 53446 invoked by uid 99); 21 Apr 2005 16:41:30 -0000
X-ASF-Spam-Status: No, hits=0.4 required=10.0
	tests=NO_REAL_NAME,UPPERCASE_25_50
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 21 Apr 2005 09:41:29 -0700
Received: (qmail 86144 invoked by uid 65534); 21 Apr 2005 16:41:11 -0000
Message-ID: <20050421164111.86143.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r164082 - in /incubator/jdo/trunk/tck20/test:
 orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
 orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
 sql/derby/schema1.sql sql/derby/schema2.sql
Date: Thu, 21 Apr 2005 16:41:11 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mcaisse
Date: Thu Apr 21 09:41:09 2005
New Revision: 164082

URL: http://svn.apache.org/viewcvs?rev=3D164082&view=3Drev
Log:
JDO-7 metadata & schema for company

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/t=
ck/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/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/appli=
cationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=3D164082=
&r1=3D164081&r2=3D164082&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/t=
ck/pc/company/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/t=
ck/pc/company/package-derby.orm Thu Apr 21 09:41:09 2005
@@ -16,11 +16,9 @@
         </class>
=20
         <class name=3D"Company" table=3D"companies">
-            <field name=3D"companyid" primary-key=3D"true"/>
-                <column name=3D"ID"/>
+            <field name=3D"companyid" column=3D"ID" primary-key=3D"true"/>
             <field name=3D"name" column=3D"NAME"/>
-            <field name=3D"founded"/>
-                <column name=3D"FOUNDEDDATE"/>
+            <field name=3D"founded" column=3D"FOUNDEDDATE"/>
             <field name=3D"address">
                 <embedded null-indicator-column=3D"COUNTRY">
                     <field name=3D"street" column=3D"STREET"/>
@@ -38,7 +36,8 @@
             <field name=3D"name" column=3D"NAME"/>
             <field name=3D"company" column=3D"COMPANYID"/>
             <field name=3D"employees" mapped-by=3D"department"/>
-            <field name=3D"fundedEmps" mapped-by=3D"fundingdept"/>
+            <field name=3D"fundedEmps" mapped-by=3D"fundingDept"/>
+            <field name=3D"employeeOfTheMonth" column=3D"EMP_OF_THE_MONTH"=
/>
         </class>
=20
         <class name=3D"PartTimeEmployee">
@@ -69,9 +68,7 @@
             <field name=3D"mentor" column=3D"MENTOR">
                         <foreign-key/>
             </field>
-            <field name=3D"protege" column=3D"PROTEGE">
-                        <foreign-key/>
-            </field>
+            <field name=3D"protege" mapped-by=3D"mentor"/>
             <field name=3D"hradvisor" column=3D"HRADVISOR">
                         <foreign-key/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/j=
do/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datas=
toreidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=3D164082&r=
1=3D164081&r2=3D164082&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- 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 Thu Apr 21 09:41:09 2005
@@ -36,7 +36,8 @@
             <field name=3D"name" column=3D"NAME"/>
             <field name=3D"company" column=3D"COMPANYID"/>
             <field name=3D"employees" mapped-by=3D"department"/>
-            <field name=3D"fundedEmps" mapped-by=3D"fundingdept"/>
+            <field name=3D"fundedEmps" mapped-by=3D"fundingDept"/>
+            <field name=3D"employeeOfTheMonth" column=3D"EMP_OF_THE_MONTH"=
/>
         </class>
=20
         <class name=3D"PartTimeEmployee">
@@ -67,9 +68,7 @@
             <field name=3D"mentor" column=3D"MENTOR">
                         <foreign-key/>
             </field>
-            <field name=3D"protege" column=3D"PROTEGE">
-                        <foreign-key/>
-            </field>
+            <field name=3D"protege" mapped-by=3D"mentor"/>
             <field name=3D"hradvisor" column=3D"HRADVISOR">
                         <foreign-key/>
             </field>

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=3D164082&r1=3D164081&r2=3D164082&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Thu Apr 21 09:41:0=
9 2005
@@ -55,32 +55,24 @@
 -------------------------
 -- company
 -------------------------
---CREATE TABLE addresses (
---    ADDRID INTEGER NOT NULL,
---    STREET VARCHAR(64) NOT NULL,
---    CITY VARCHAR(64) NOT NULL,
---    STATE CHAR(2) NOT NULL,
---    ZIPCODE CHAR(5) NOT NULL,
---    COUNTRY VARCHAR(64) NOT NULL,
---    CONSTRAINT ADDR_PK PRIMARY KEY (ID)
---);
=20
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
-    STREET VARCHAR(64) NOT NULL,
-    CITY VARCHAR(64) NOT NULL,
-    STATE CHAR(2) NOT NULL,
-    ZIPCODE CHAR(5) NOT NULL,
-    COUNTRY VARCHAR(64) NOT NULL,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
=20
 CREATE TABLE departments (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    COMPANYID INTEGER REFERENCES COMPANIES NOT NULL,
+    EMP_OF_THE_MONTH INTEGER,
+    COMPANYID INTEGER REFERENCES companies,
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
=20
@@ -90,11 +82,11 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
-    STREET VARCHAR(64) NOT NULL,
-    CITY VARCHAR(64) NOT NULL,
-    STATE CHAR(2) NOT NULL,
-    ZIPCODE CHAR(5) NOT NULL,
-    COUNTRY VARCHAR(64) NOT NULL,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
     HIREDATE VARCHAR(32) NOT NULL,
     WEEKLYHOURS FLOAT NOT NULL,
     DEPARTMENT INTEGER REFERENCES departments NOT NULL,
@@ -141,6 +133,11 @@
     TYPE VARCHAR(16) NOT NULL
 );
=20
+ALTER TABLE departments (
+    ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
+        (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID)
+);
+
 -------------------------
 --fieldtypes
 -------------------------
@@ -148,6 +145,61 @@
 -------------------------
 --inheritance
 -------------------------
+
+CREATE TABLE AllPersist (
+    KEY_VALUE INTEGER NOT NULL,
+    DOUBLE_B DOUBLE,
+    FLOAT_E FLOAT,
+    SHORT_F SMALLINT,
+    SECOND_OBJ INTEGER,
+    THIRD_OBJ INTEGER,
+    INT_H INTEGER,
+    CONSTRAINT AllPersist_PK PRIMARY KEY (KEY_VALUE),
+    FOREIGN KEY (SECOND_OBJ) REFERENCES AllPersist (KEY_VALUE),
+    FOREIGN KEY (THIRD_OBJ) REFERENCES AllPersist (KEY_VALUE)
+);
+
+CREATE TABLE TopNonPersistB (
+    KEY_VALUE INTEGER NOT NULL,
+    DOUBLE_B DOUBLE,
+    INT_B INTEGER,
+    FLOAT_E FLOAT,
+    SHORT_F SMALLINT,
+    SECOND_OBJ INTEGER,
+    THIRD_OBJ INTEGER,
+    INT_H INTEGER,
+    CONSTRAINT TopNonPersistB_PK PRIMARY KEY (KEY_VALUE),
+    FOREIGN KEY (SECOND_OBJ) REFERENCES TopNonPersistB (KEY_VALUE),
+    FOREIGN KEY (THIRD_OBJ) REFERENCES TopNonPersistB (KEY_VALUE)
+);
+
+CREATE TABLE TopPersist (
+    KEY_VALUE INTEGER NOT NULL,
+    DOUBLE_B DOUBLE,
+    INT_B INTEGER,
+    FLOAT_E FLOAT,
+    SHORT_F SMALLINT,
+    SECOND_OBJ INTEGER,
+    THIRD_OBJ INTEGER,
+    INT_H INTEGER,
+    CONSTRAINT TopPersist_PK PRIMARY KEY (KEY_VALUE),
+    FOREIGN KEY (SECOND_OBJ) REFERENCES TopPersist (KEY_VALUE),
+    FOREIGN KEY (THIRD_OBJ) REFERENCES TopPersist (KEY_VALUE)
+);
+
+CREATE TABLE FieldSameName (
+    KEY_VALUE INTEGER NOT NULL,
+    N2 DOUBLE,
+    N3 INTEGER,
+    FSN2_N3 FLOAT,
+    FSN3_N1 SMALLINT,
+    FSN3_N2 INTEGER,
+    FSN3_N3 INTEGER,
+    FSN4_N3 INTEGER,
+    CONSTRAINT FieldSameName_PK PRIMARY KEY (KEY_VALUE),
+    FOREIGN KEY (FSN3_N2) REFERENCES FieldSameName (KEY_VALUE),
+    FOREIGN KEY (FSN3_N3) REFERENCES FieldSameName (KEY_VALUE)
+);
=20
 -------------------------
 --instancecallbacks

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=3D164082&r1=3D164081&r2=3D164082&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Thu Apr 21 09:41:0=
9 2005
@@ -55,32 +55,24 @@
 -------------------------
 -- company
 -------------------------
---CREATE TABLE addresses (
---    ADDRID INTEGER NOT NULL,
---    STREET VARCHAR(64) NOT NULL,
---    CITY VARCHAR(64) NOT NULL,
---    STATE CHAR(2) NOT NULL,
---    ZIPCODE CHAR(5) NOT NULL,
---    COUNTRY VARCHAR(64) NOT NULL,
---    CONSTRAINT ADDR_PK PRIMARY KEY (ID)
---);
=20
 CREATE TABLE companies (
     ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
-    STREET VARCHAR(64) NOT NULL,
-    CITY VARCHAR(64) NOT NULL,
-    STATE CHAR(2) NOT NULL,
-    ZIPCODE CHAR(5) NOT NULL,
-    COUNTRY VARCHAR(64) NOT NULL,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
=20
 CREATE TABLE departments (
     ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     NAME VARCHAR(32) NOT NULL,
-    COMPANYID INTEGER REFERENCES COMPANIES NOT NULL,
+    EMP_OF_THE_MONTH INTEGER,
+    COMPANYID INTEGER REFERENCES companies,
     CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
 );
=20
@@ -90,11 +82,11 @@
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
     BIRTHDATE VARCHAR(32) NOT NULL,
-    STREET VARCHAR(64) NOT NULL,
-    CITY VARCHAR(64) NOT NULL,
-    STATE CHAR(2) NOT NULL,
-    ZIPCODE CHAR(5) NOT NULL,
-    COUNTRY VARCHAR(64) NOT NULL,
+    STREET VARCHAR(64),
+    CITY VARCHAR(64),
+    STATE CHAR(2),
+    ZIPCODE CHAR(5),
+    COUNTRY VARCHAR(64),
     HIREDATE VARCHAR(32) NOT NULL,
     WEEKLYHOURS FLOAT NOT NULL,
     DEPARTMENT INTEGER REFERENCES departments NOT NULL,
@@ -139,6 +131,11 @@
     empid INTEGER REFERENCES persons NOT NULL,
     phoneno VARCHAR(16) NOT NULL,
     type VARCHAR(16) NOT NULL
+);
+
+ALTER TABLE departments (
+    ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
+        (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID)
 );
=20
 -------------------------