From jdo-commits-return-1459-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org Mon May 01 15:32:30 2006 Return-Path: Delivered-To: apmail-db-jdo-commits-archive@www.apache.org Received: (qmail 67586 invoked from network); 1 May 2006 15:32:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 May 2006 15:32:30 -0000 Received: (qmail 12338 invoked by uid 500); 1 May 2006 15:32:29 -0000 Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jdo-dev@db.apache.org Delivered-To: mailing list jdo-commits@db.apache.org Received: (qmail 12323 invoked by uid 99); 1 May 2006 15:32:29 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 May 2006 08:32:29 -0700 X-ASF-Spam-Status: No, hits=-8.9 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_50_75 X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 01 May 2006 08:32:28 -0700 Received: (qmail 67227 invoked by uid 65534); 1 May 2006 15:32:08 -0000 Message-ID: <20060501153208.67226.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r398624 - in /db/jdo/trunk/tck20/src/sql/derby: applicationidentity/schema.sql datastoreidentity/schema.sql Date: Mon, 01 May 2006 15:32:07 -0000 To: jdo-commits@db.apache.org From: mbo@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mbo Date: Mon May 1 08:32:07 2006 New Revision: 398624 URL: http://svn.apache.org/viewcvs?rev=398624&view=rev Log: JDO-375: adds names to the foreign key constraints for the company model in schema 0 Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql?rev=398624&r1=398623&r2=398624&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql (original) +++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql Mon May 1 08:32:07 2006 @@ -161,8 +161,15 @@ ------------------------- ALTER TABLE departments DROP CONSTRAINT EMP_MO_FK; +ALTER TABLE departments DROP CONSTRAINT DEPTS_COMP_FK; ALTER TABLE project_reviewer DROP CONSTRAINT PR_PROJ_FK; ALTER TABLE project_reviewer DROP CONSTRAINT PR_REV_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_DEPT_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_FUNDDEPT_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_MANAGER_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_MENTOR_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_HRADVISOR_FK; +ALTER TABLE insuranceplans DROP CONSTRAINT INS_EMP_FK; DROP TABLE insuranceplans; DROP TABLE project_reviewer; DROP TABLE project_member; @@ -190,8 +197,9 @@ ID INTEGER NOT NULL, NAME VARCHAR(32) NOT NULL, EMP_OF_THE_MONTH INTEGER, - COMPANYID INTEGER REFERENCES companies, + COMPANYID INTEGER, DISCRIMINATOR VARCHAR(255), + CONSTRAINT DEPTS_COMP_FK FOREIGN KEY (COMPANYID) REFERENCES companies, CONSTRAINT DEPTS_PK PRIMARY KEY (ID) ); @@ -209,14 +217,19 @@ COUNTRY VARCHAR(64), HIREDATE VARCHAR(32), WEEKLYHOURS REAL, - DEPARTMENT INTEGER REFERENCES departments, - FUNDINGDEPT INTEGER REFERENCES departments, - MANAGER INTEGER REFERENCES persons, - MENTOR INTEGER REFERENCES persons, - HRADVISOR INTEGER REFERENCES persons, + DEPARTMENT INTEGER, + FUNDINGDEPT INTEGER, + MANAGER INTEGER, + MENTOR INTEGER, + HRADVISOR INTEGER, SALARY REAL, WAGE REAL, DISCRIMINATOR varchar(64) NOT NULL, + CONSTRAINT PERS_DEPT_FK FOREIGN KEY (DEPARTMENT) REFERENCES departments, + CONSTRAINT PERS_FUNDDEPT_FK FOREIGN KEY (FUNDINGDEPT) REFERENCES departments, + CONSTRAINT PERS_MANAGER_FK FOREIGN KEY (MANAGER) REFERENCES persons, + CONSTRAINT PERS_MENTOR_FK FOREIGN KEY (MENTOR) REFERENCES persons, + CONSTRAINT PERS_HRADVISOR_FK FOREIGN KEY (HRADVISOR) REFERENCES persons, CONSTRAINT EMPS_PK PRIMARY KEY (PERSONID) ); @@ -226,7 +239,8 @@ LIFETIME_ORTHO_BENEFIT DECIMAL(22,3), PLANTYPE VARCHAR(8), DISCRIMINATOR varchar(64) NOT NULL, - EMPLOYEE INTEGER REFERENCES persons, + EMPLOYEE INTEGER, + CONSTRAINT INS_EMP_FK FOREIGN KEY (EMPLOYEE) REFERENCES persons, CONSTRAINT INS_PK PRIMARY KEY (INSID) ); Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql?rev=398624&r1=398623&r2=398624&view=diff ============================================================================== --- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql (original) +++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Mon May 1 08:32:07 2006 @@ -108,8 +108,15 @@ ------------------------- ALTER TABLE departments DROP CONSTRAINT EMP_MO_FK; +ALTER TABLE departments DROP CONSTRAINT DEPTS_COMP_FK; ALTER TABLE project_reviewer DROP CONSTRAINT PR_PROJ_FK; ALTER TABLE project_reviewer DROP CONSTRAINT PR_REV_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_DEPT_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_FUNDDEPT_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_MANAGER_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_MENTOR_FK; +ALTER TABLE persons DROP CONSTRAINT PERS_HRADVISOR_FK; +ALTER TABLE insuranceplans DROP CONSTRAINT INS_EMP_FK; DROP TABLE insuranceplans; DROP TABLE project_reviewer; DROP TABLE project_member; @@ -139,8 +146,9 @@ ID INTEGER, NAME VARCHAR(32) NOT NULL, EMP_OF_THE_MONTH INTEGER, - COMPANYID INTEGER REFERENCES companies, + COMPANYID INTEGER, DISCRIMINATOR VARCHAR(255), + CONSTRAINT DEPTS_COMP_FK FOREIGN KEY (COMPANYID) REFERENCES companies, CONSTRAINT DEPTS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -159,14 +167,19 @@ COUNTRY VARCHAR(64), HIREDATE VARCHAR(32), WEEKLYHOURS REAL, - DEPARTMENT INTEGER REFERENCES departments, - FUNDINGDEPT INTEGER REFERENCES departments, - MANAGER INTEGER REFERENCES persons, - MENTOR INTEGER REFERENCES persons, - HRADVISOR INTEGER REFERENCES persons, + DEPARTMENT INTEGER, + FUNDINGDEPT INTEGER, + MANAGER INTEGER, + MENTOR INTEGER, + HRADVISOR INTEGER, SALARY REAL, WAGE REAL, DISCRIMINATOR varchar(64) NOT NULL, + CONSTRAINT PERS_DEPT_FK FOREIGN KEY (DEPARTMENT) REFERENCES departments, + CONSTRAINT PERS_FUNDDEPT_FK FOREIGN KEY (FUNDINGDEPT) REFERENCES departments, + CONSTRAINT PERS_MANAGER_FK FOREIGN KEY (MANAGER) REFERENCES persons, + CONSTRAINT PERS_MENTOR_FK FOREIGN KEY (MENTOR) REFERENCES persons, + CONSTRAINT PERS_HRADVISOR_FK FOREIGN KEY (HRADVISOR) REFERENCES persons, CONSTRAINT PERS_UK UNIQUE (PERSONID), CONSTRAINT PERS_PK PRIMARY KEY (DATASTORE_IDENTITY) ); @@ -178,7 +191,8 @@ LIFETIME_ORTHO_BENEFIT DECIMAL(22,3), PLANTYPE VARCHAR(8), DISCRIMINATOR varchar(64) NOT NULL, - EMPLOYEE INTEGER REFERENCES persons, + EMPLOYEE INTEGER, + CONSTRAINT INS_EMP_FK FOREIGN KEY (EMPLOYEE) REFERENCES persons, CONSTRAINT INS_PK PRIMARY KEY (DATASTORE_IDENTITY) );