Author: clr
Date: Fri Apr 22 21:44:41 2005
New Revision: 164335
URL: http://svn.apache.org/viewcvs?rev=164335&view=rev
Log:
JDO-29 Columns for subclass fields redefined as nullable for Person and
Insurance tables
Modified:
incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
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=164335&r1=164334&r2=164335&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Fri Apr 22 21:44:41
2005
@@ -102,15 +102,15 @@
STATE CHAR(2),
ZIPCODE CHAR(5),
COUNTRY VARCHAR(64),
- HIREDATE VARCHAR(32) NOT NULL,
- WEEKLYHOURS FLOAT NOT NULL,
- DEPARTMENT INTEGER REFERENCES departments NOT NULL,
- FUNDINGDEPT INTEGER REFERENCES departments NOT NULL,
- MANAGER INTEGER REFERENCES persons NOT NULL,
- MENTOR INTEGER REFERENCES persons NOT NULL,
- HRADVISOR INTEGER REFERENCES persons NOT NULL,
- SALARY FLOAT NOT NULL,
- WAGE FLOAT NOT NULL,
+ HIREDATE VARCHAR(32),
+ WEEKLYHOURS FLOAT,
+ DEPARTMENT INTEGER REFERENCES departments,
+ FUNDINGDEPT INTEGER REFERENCES departments,
+ MANAGER INTEGER REFERENCES persons,
+ MENTOR INTEGER REFERENCES persons,
+ HRADVISOR INTEGER REFERENCES persons,
+ SALARY FLOAT,
+ WAGE FLOAT,
DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT EMPS_PK PRIMARY KEY (PERSONID)
);
@@ -118,8 +118,8 @@
CREATE TABLE insuranceplans (
INSID INTEGER NOT NULL,
CARRIER VARCHAR(64) NOT NULL,
- LIFETIME_ORTHO_BENEFIT DECIMAL NOT NULL,
- PLANTYPE VARCHAR(8) NOT NULL,
+ LIFETIME_ORTHO_BENEFIT DECIMAL,
+ PLANTYPE VARCHAR(8),
DISCRIMINATOR varchar(64) NOT NULL,
EMPLOYEE INTEGER REFERENCES persons,
CONSTRAINT INS_PK PRIMARY KEY (INSID)
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=164335&r1=164334&r2=164335&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Fri Apr 22 21:44:41
2005
@@ -102,15 +102,15 @@
STATE CHAR(2),
ZIPCODE CHAR(5),
COUNTRY VARCHAR(64),
- HIREDATE VARCHAR(32) NOT NULL,
- WEEKLYHOURS FLOAT NOT NULL,
- DEPARTMENT INTEGER REFERENCES departments NOT NULL,
- FUNDINGdEPT INTEGER REFERENCES departments NOT NULL,
- MANAGER INTEGER REFERENCES persons NOT NULL,
- MENTOR INTEGER REFERENCES persons NOT NULL,
- HRADVISOR INTEGER REFERENCES persons NOT NULL,
- SALARY FLOAT NOT NULL,
- WAGE FLOAT NOT NULL,
+ HIREDATE VARCHAR(32),
+ WEEKLYHOURS FLOAT,
+ DEPARTMENT INTEGER REFERENCES departments,
+ FUNDINGdEPT INTEGER REFERENCES departments,
+ MANAGER INTEGER REFERENCES persons,
+ MENTOR INTEGER REFERENCES persons,
+ HRADVISOR INTEGER REFERENCES persons,
+ SALARY FLOAT,
+ WAGE FLOAT,
DISCRIMINATOR varchar(64) NOT NULL,
CONSTRAINT EMPS_PK PRIMARY KEY (PERSONID)
);
@@ -118,8 +118,8 @@
CREATE TABLE insuranceplans (
INSID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
CARRIER VARCHAR(64) NOT NULL,
- LIFETIME_ORTHO_BENEFIT DECIMAL NOT NULL,
- PLANtYPE VARCHAR(8) NOT NULL,
+ LIFETIME_ORTHO_BENEFIT DECIMAL,
+ PLANtYPE VARCHAR(8),
DISCRIMINATOR VARCHAR(64) NOT NULL,
EMPLOYEE INTEGER REFERENCES persons,
CONSTRAINT INS_PK PRIMARY KEY (INSID)
