You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2007/04/09 22:43:06 UTC

svn commit: r526905 - in /db/jdo/trunk/tck20/src/sql/derby: applicationidentity/ datastoreidentity/

Author: mcaisse
Date: Mon Apr  9 13:43:00 2007
New Revision: 526905

URL: http://svn.apache.org/viewvc?view=rev&rev=526905
Log:
JDO-480 VARCHAR -> TIMESTAMP; also fixed line endings on some files.

Modified:
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema1.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema2.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema3.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema4.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema5.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema6.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema7.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema8.sql
    db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema9.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema1.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema2.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema3.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema4.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema8.sql
    db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema9.sql

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema.sql Mon Apr  9 13:43:00 2007
@@ -218,7 +218,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -244,14 +244,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema1.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema1.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema1.sql Mon Apr  9 13:43:00 2007
@@ -50,7 +50,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -73,7 +73,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -85,7 +85,7 @@
 
 CREATE TABLE employees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema10.sql Mon Apr  9 13:43:00 2007
@@ -38,7 +38,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
 
@@ -57,10 +57,10 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ORDER_COL INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema2.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema2.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema2.sql Mon Apr  9 13:43:00 2007
@@ -58,7 +58,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -81,7 +81,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -96,14 +96,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,
@@ -119,14 +119,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema3.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema3.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema3.sql Mon Apr  9 13:43:00 2007
@@ -51,7 +51,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -74,7 +74,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -86,7 +86,7 @@
 
 CREATE TABLE parttimeemployees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,
@@ -100,7 +100,7 @@
 
 CREATE TABLE fulltimeemployees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema4.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema4.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema4.sql Mon Apr  9 13:43:00 2007
@@ -46,7 +46,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -69,7 +69,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -81,7 +81,7 @@
 
 CREATE TABLE employees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema5.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema5.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema5.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema5.sql Mon Apr  9 13:43:00 2007
@@ -13,23 +13,23 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
--- SchemaType: application identity orm
-
-connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
-
-CREATE SCHEMA applicationidentity_orm;
-SET SCHEMA applicationidentity_orm;
-
--------------------------
--- mylib
--------------------------
-
-DROP TABLE PCPoint;
-
-CREATE TABLE PCPoint (
-    ID BIGINT NOT NULL,
-    X INTEGER NOT NULL,
-    Y INTEGER,
-    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
-);
-
+-- SchemaType: application identity orm
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity_orm;
+SET SCHEMA applicationidentity_orm;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema6.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema6.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema6.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema6.sql Mon Apr  9 13:43:00 2007
@@ -13,23 +13,23 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
--- SchemaType: application identity pkg
-
-connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
-
-CREATE SCHEMA applicationidentity_pkg;
-SET SCHEMA applicationidentity_pkg;
-
--------------------------
--- mylib
--------------------------
-
-DROP TABLE PCPoint;
-
-CREATE TABLE PCPoint (
-    ID BIGINT NOT NULL,
-    X INTEGER NOT NULL,
-    Y INTEGER,
-    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
-);
-
+-- SchemaType: application identity pkg
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity_pkg;
+SET SCHEMA applicationidentity_pkg;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema7.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema7.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema7.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema7.sql Mon Apr  9 13:43:00 2007
@@ -13,23 +13,23 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
--- SchemaType: application identity cls
-
-connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
-
-CREATE SCHEMA applicationidentity_cls;
-SET SCHEMA applicationidentity_cls;
-
--------------------------
--- mylib
--------------------------
-
-DROP TABLE PCPoint;
-
-CREATE TABLE PCPoint (
-    ID BIGINT NOT NULL,
-    X INTEGER NOT NULL,
-    Y INTEGER,
-    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
-);
-
+-- SchemaType: application identity cls
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity_cls;
+SET SCHEMA applicationidentity_cls;
+
+-------------------------
+-- mylib
+-------------------------
+
+DROP TABLE PCPoint;
+
+CREATE TABLE PCPoint (
+    ID BIGINT NOT NULL,
+    X INTEGER NOT NULL,
+    Y INTEGER,
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+);
+

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema8.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema8.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema8.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema8.sql Mon Apr  9 13:43:00 2007
@@ -13,51 +13,51 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
--- SchemaType: application identity
-
-connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
-
-CREATE SCHEMA applicationidentity8;
-SET SCHEMA applicationidentity8;
-
-DROP TABLE CART_ENTRIES;
-DROP TABLE CARTS;
-DROP TABLE PRODUCTS;
-DROP TABLE UNDETACHABLES;
-
-CREATE TABLE CARTS (
-    CART_ID BIGINT NOT NULL,
-    CUSTOMER_ID VARCHAR(128) NOT NULL,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT CARTS_PK PRIMARY KEY (CART_ID)
-);
-
-CREATE TABLE PRODUCTS (
-    SKU VARCHAR(48) NOT NULL,
-    DESCRIPTION VARCHAR(128),
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT PRODUCTS_PK PRIMARY KEY (SKU)
-);
-
-CREATE TABLE CART_ENTRIES (
-    ID BIGINT NOT NULL,
-    QUANTITY INTEGER DEFAULT 0,
-    CART_ID BIGINT NOT NULL,
-    SKU VARCHAR(48) NOT NULL,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT CART_ENTRIES_PK  PRIMARY KEY (ID),
-    CONSTRAINT CARTS_FK         FOREIGN KEY (CART_ID)   REFERENCES CARTS,
-    CONSTRAINT PRODUCTS_FK      FOREIGN KEY (SKU)       REFERENCES PRODUCTS
-);
-
-CREATE TABLE UNDETACHABLES (
-    ID BIGINT NOT NULL,
-    FOO INTEGER,
-    BAR INTEGER,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT UNDETACHABLES_PK PRIMARY KEY (ID)
-);
+-- SchemaType: application identity
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA applicationidentity8;
+SET SCHEMA applicationidentity8;
+
+DROP TABLE CART_ENTRIES;
+DROP TABLE CARTS;
+DROP TABLE PRODUCTS;
+DROP TABLE UNDETACHABLES;
+
+CREATE TABLE CARTS (
+    CART_ID BIGINT NOT NULL,
+    CUSTOMER_ID VARCHAR(128) NOT NULL,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT CARTS_PK PRIMARY KEY (CART_ID)
+);
+
+CREATE TABLE PRODUCTS (
+    SKU VARCHAR(48) NOT NULL,
+    DESCRIPTION VARCHAR(128),
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT PRODUCTS_PK PRIMARY KEY (SKU)
+);
+
+CREATE TABLE CART_ENTRIES (
+    ID BIGINT NOT NULL,
+    QUANTITY INTEGER DEFAULT 0,
+    CART_ID BIGINT NOT NULL,
+    SKU VARCHAR(48) NOT NULL,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT CART_ENTRIES_PK  PRIMARY KEY (ID),
+    CONSTRAINT CARTS_FK         FOREIGN KEY (CART_ID)   REFERENCES CARTS,
+    CONSTRAINT PRODUCTS_FK      FOREIGN KEY (SKU)       REFERENCES PRODUCTS
+);
+
+CREATE TABLE UNDETACHABLES (
+    ID BIGINT NOT NULL,
+    FOO INTEGER,
+    BAR INTEGER,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT UNDETACHABLES_PK PRIMARY KEY (ID)
+);

Modified: db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema9.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema9.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema9.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/applicationidentity/schema9.sql Mon Apr  9 13:43:00 2007
@@ -38,7 +38,7 @@
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
 
@@ -57,10 +57,10 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ROLE VARCHAR(32),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema.sql Mon Apr  9 13:43:00 2007
@@ -145,7 +145,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -173,14 +173,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema1.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema1.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema1.sql Mon Apr  9 13:43:00 2007
@@ -51,7 +51,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -78,7 +78,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -91,7 +91,7 @@
 
 CREATE TABLE employees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema10.sql Mon Apr  9 13:43:00 2007
@@ -39,7 +39,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
@@ -60,10 +60,10 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ORDER_COL INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema2.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema2.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema2.sql Mon Apr  9 13:43:00 2007
@@ -59,7 +59,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -86,7 +86,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -103,14 +103,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,
@@ -138,14 +138,14 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema3.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema3.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema3.sql Mon Apr  9 13:43:00 2007
@@ -52,7 +52,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -79,7 +79,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAM, NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -92,7 +92,7 @@
 
 CREATE TABLE parttimeemployees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,
@@ -117,7 +117,7 @@
 
 CREATE TABLE fulltimeemployees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema4.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema4.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema4.sql Mon Apr  9 13:43:00 2007
@@ -47,7 +47,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -74,7 +74,7 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -87,7 +87,7 @@
 
 CREATE TABLE employees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema8.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema8.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema8.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema8.sql Mon Apr  9 13:43:00 2007
@@ -13,63 +13,63 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 
--- SchemaType: datastore identity
-
-connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
-
-CREATE SCHEMA datastoreidentity8;
-SET SCHEMA datastoreidentity8;
-
-DROP TABLE CART_ENTRIES;
-DROP TABLE CARTS;
-DROP TABLE PRODUCTS;
-DROP TABLE UNDETACHABLES;
-
-CREATE TABLE CARTS (
-
-    DATASTORE_ID BIGINT NOT NULL,
-    CART_ID BIGINT NOT NULL,
-    CUSTOMER_ID VARCHAR(128) NOT NULL,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT CARTS_PK PRIMARY KEY (DATASTORE_ID),
-    CONSTRAINT CARTS_UK UNIQUE      (CART_ID)
-);
-
-CREATE TABLE PRODUCTS (
-
-    DATASTORE_ID VARCHAR(48) NOT NULL,
-    SKU VARCHAR(48) NOT NULL,
-    DESCRIPTION VARCHAR(128),
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT PRODUCTS_PK  PRIMARY KEY  (DATASTORE_ID),
-    CONSTRAINT PRODUCTS_UK  UNIQUE       (SKU)
-);
-
-CREATE TABLE CART_ENTRIES (
-
-    DATASTORE_ID BIGINT NOT NULL,
-    ID BIGINT NOT NULL,
-    QUANTITY INTEGER DEFAULT 0,
-    CART_ID BIGINT NOT NULL,
-    SKU VARCHAR(48) NOT NULL,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT CART_ENTRIES_PK  PRIMARY KEY (DATASTORE_ID),
-    CONSTRAINT CART_ENTRIES_UK  UNIQUE      (ID),
-    CONSTRAINT CARTS_FK         FOREIGN KEY (CART_ID)   REFERENCES CARTS,
-    CONSTRAINT PRODUCTS_FK      FOREIGN KEY (SKU)       REFERENCES PRODUCTS
-);
-
-CREATE TABLE UNDETACHABLES (
-
-    DATASTORE_ID BIGINT NOT NULL,
-    ID BIGINT NOT NULL,
-    FOO INTEGER,
-    BAR INTEGER,
-    VERSION INTEGER NOT NULL DEFAULT 0,
-
-    CONSTRAINT UNDETACHABLES_PK PRIMARY KEY (DATASTORE_ID),
-    CONSTRAINT UNDETACHABLES_UK UNIQUE      (ID)
-);
+-- SchemaType: datastore identity
+
+connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
+
+CREATE SCHEMA datastoreidentity8;
+SET SCHEMA datastoreidentity8;
+
+DROP TABLE CART_ENTRIES;
+DROP TABLE CARTS;
+DROP TABLE PRODUCTS;
+DROP TABLE UNDETACHABLES;
+
+CREATE TABLE CARTS (
+
+    DATASTORE_ID BIGINT NOT NULL,
+    CART_ID BIGINT NOT NULL,
+    CUSTOMER_ID VARCHAR(128) NOT NULL,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT CARTS_PK PRIMARY KEY (DATASTORE_ID),
+    CONSTRAINT CARTS_UK UNIQUE      (CART_ID)
+);
+
+CREATE TABLE PRODUCTS (
+
+    DATASTORE_ID VARCHAR(48) NOT NULL,
+    SKU VARCHAR(48) NOT NULL,
+    DESCRIPTION VARCHAR(128),
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT PRODUCTS_PK  PRIMARY KEY  (DATASTORE_ID),
+    CONSTRAINT PRODUCTS_UK  UNIQUE       (SKU)
+);
+
+CREATE TABLE CART_ENTRIES (
+
+    DATASTORE_ID BIGINT NOT NULL,
+    ID BIGINT NOT NULL,
+    QUANTITY INTEGER DEFAULT 0,
+    CART_ID BIGINT NOT NULL,
+    SKU VARCHAR(48) NOT NULL,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT CART_ENTRIES_PK  PRIMARY KEY (DATASTORE_ID),
+    CONSTRAINT CART_ENTRIES_UK  UNIQUE      (ID),
+    CONSTRAINT CARTS_FK         FOREIGN KEY (CART_ID)   REFERENCES CARTS,
+    CONSTRAINT PRODUCTS_FK      FOREIGN KEY (SKU)       REFERENCES PRODUCTS
+);
+
+CREATE TABLE UNDETACHABLES (
+
+    DATASTORE_ID BIGINT NOT NULL,
+    ID BIGINT NOT NULL,
+    FOO INTEGER,
+    BAR INTEGER,
+    VERSION INTEGER NOT NULL DEFAULT 0,
+
+    CONSTRAINT UNDETACHABLES_PK PRIMARY KEY (DATASTORE_ID),
+    CONSTRAINT UNDETACHABLES_UK UNIQUE      (ID)
+);

Modified: db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema9.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema9.sql?view=diff&rev=526905&r1=526904&r2=526905
==============================================================================
--- db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema9.sql (original)
+++ db/jdo/trunk/tck20/src/sql/derby/datastoreidentity/schema9.sql Mon Apr  9 13:43:00 2007
@@ -39,7 +39,7 @@
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE VARCHAR(32) NOT NULL,
+    FOUNDEDDATE TIMESTAMP NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
@@ -60,10 +60,10 @@
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE VARCHAR(32) NOT NULL,
+    BIRTHDATE TIMESTAMP NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ROLE VARCHAR(32),
-    HIREDATE VARCHAR(32),
+    HIREDATE TIMESTAMP,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,