db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1486167 - in /db/jdo/trunk/tck/src: java/org/apache/jdo/tck/pc/company/ java/org/apache/jdo/tck/pc/companyListWithoutJoin/ java/org/apache/jdo/tck/pc/companyMapWithoutJoin/ java/org/apache/jdo/tck/pc/mylib/ java/org/apache/jdo/tck/pc/order...
Date Fri, 24 May 2013 18:53:44 GMT
Author: mbo
Date: Fri May 24 18:53:44 2013
New Revision: 1486167

URL: http://svn.apache.org/r1486167
Log:
JDO-720: Possible time zone issue in SupportedDateMethods. Removed explicit time zone settings
and changed database column type from TIMESTAMP to DATE

Modified:
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
    db/jdo/trunk/tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema10.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema11.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema9.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema10.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema11.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema9.sql

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/company/CompanyModelReader.java Fri May
24 18:53:44 2013
@@ -94,8 +94,7 @@ public class CompanyModelReader extends 
      */
     private void configureFactory() {
         SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US);
-        formatter.setTimeZone(TimeZone.getTimeZone("America/New_York"));
-        CustomDateEditor dateEditor = 
+        CustomDateEditor dateEditor =
             new CustomDateEditor(formatter, true);
         registerCustomEditor(Date.class, dateEditor);
         companyFactory = CompanyFactoryRegistry.getInstance();
@@ -117,7 +116,7 @@ public class CompanyModelReader extends 
     }
 
     public static Date stringToUtilDate(String value) {
-        return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value);
+        return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value);
     }
     
     // Convenience methods

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyListWithoutJoin/CompanyModelReader.java
Fri May 24 18:53:44 2013
@@ -94,8 +94,7 @@ public class CompanyModelReader extends 
      */
     private void configureFactory() {
         SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US);
-        formatter.setTimeZone(TimeZone.getTimeZone("America/New_York"));
-        CustomDateEditor dateEditor = 
+        CustomDateEditor dateEditor =
             new CustomDateEditor(formatter, true);
         registerCustomEditor(Date.class, dateEditor);
         companyFactory = CompanyFactoryRegistry.getInstance();
@@ -191,7 +190,7 @@ public class CompanyModelReader extends 
     }
 
     public static Date stringToUtilDate(String value) {
-        return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value);
+        return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value);
     }
 }
 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/companyMapWithoutJoin/CompanyModelReader.java
Fri May 24 18:53:44 2013
@@ -94,8 +94,7 @@ public class CompanyModelReader extends 
      */
     private void configureFactory() {
         SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US);
-        formatter.setTimeZone(TimeZone.getTimeZone("America/New_York"));
-        CustomDateEditor dateEditor = 
+        CustomDateEditor dateEditor =
             new CustomDateEditor(formatter, true);
         registerCustomEditor(Date.class, dateEditor);
         companyFactory = CompanyFactoryRegistry.getInstance();
@@ -191,7 +190,7 @@ public class CompanyModelReader extends 
     }
 
     public static Date stringToUtilDate(String value) {
-        return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York", Locale.US, value);
+        return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value);
     }
 }
 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/mylib/MylibReader.java Fri May 24 18:53:44
2013
@@ -90,8 +90,7 @@ public class MylibReader extends XmlBean
      */
     private void configureFactory() {
         SimpleDateFormat formatter = new SimpleDateFormat(DATE_PATTERN, Locale.US);
-        formatter.setTimeZone(TimeZone.getTimeZone("America/New_York"));
-        CustomDateEditor dateEditor = 
+        CustomDateEditor dateEditor =
             new CustomDateEditor(formatter, true);
         registerCustomEditor(Date.class, dateEditor);
     }

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/pc/order/OrderModelReader.java Fri May 24
18:53:44 2013
@@ -94,8 +94,7 @@ public class OrderModelReader extends Xm
     private void configureFactory() {
         SimpleDateFormat formatter =
             new SimpleDateFormat(DATE_PATTERN, Locale.US);
-        formatter.setTimeZone(TimeZone.getTimeZone("America/New_York"));
-        CustomDateEditor dateEditor = 
+        CustomDateEditor dateEditor =
             new CustomDateEditor(formatter, true);
         registerCustomEditor(Date.class, dateEditor);
         orderFactory = OrderFactoryRegistry.getInstance();
@@ -143,8 +142,7 @@ public class OrderModelReader extends Xm
     }
 
     public static Date stringToUtilDate(String value) {
-        return ConversionHelper.toUtilDate(DATE_PATTERN, "America/New_York",
-                Locale.US, value);
+        return ConversionHelper.toUtilDate(DATE_PATTERN, Locale.US, value);
     }
 }
 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/operators/EqualityAndComparisonsBetweenDateFieldsAndParameters.java
Fri May 24 18:53:44 2013
@@ -117,8 +117,7 @@ public class EqualityAndComparisonsBetwe
     private static final Date FIRST_OF_JAN_1999;
     static {
         // initialize static field FIRST_OF_JAN_1999
-        Calendar cal = new GregorianCalendar(
-            TimeZone.getTimeZone("America/New_York"));
+        Calendar cal = new GregorianCalendar();
         cal.set(1999, GregorianCalendar.JANUARY, 1, 0, 0, 0);
         cal.set(GregorianCalendar.MILLISECOND, 0);
         FIRST_OF_JAN_1999 = cal.getTime();

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/CorrelatedSubqueriesWithParameters.java
Fri May 24 18:53:44 2013
@@ -117,8 +117,7 @@ public class CorrelatedSubqueriesWithPar
             "(SELECT AVG(e.weeklyhours) FROM " + Employee.class.getName() +
             " e WHERE e.manager == this.manager)"; 
 
-        Calendar cal = Calendar.getInstance(
-            TimeZone.getTimeZone("America/New_York"), Locale.US);
+        Calendar cal = Calendar.getInstance(Locale.US);
         cal.set(2002, Calendar.SEPTEMBER, 1, 0, 0, 0);
         Date hired = cal.getTime();
 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/jdoql/subqueries/NonCorrelatedSubqueries.java
Fri May 24 18:53:44 2013
@@ -111,8 +111,7 @@ public class NonCorrelatedSubqueries ext
             "this.weeklyhours> (SELECT AVG(e.weeklyhours) FROM " +
             Employee.class.getName() + " e)";
 
-        Calendar cal = Calendar.getInstance(
-            TimeZone.getTimeZone("America/New_York"), Locale.US);
+        Calendar cal = Calendar.getInstance(Locale.US);
         cal.set(2002, Calendar.SEPTEMBER, 1, 0, 0, 0);
         Date hired = cal.getTime();
 

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
(original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/query/result/ProjectedSCODoesNotTrackChanges.java
Fri May 24 18:53:44 2013
@@ -18,6 +18,7 @@
 
 package org.apache.jdo.tck.query.result;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import javax.jdo.JDOHelper;
@@ -49,8 +50,15 @@ public class ProjectedSCODoesNotTrackCha
     private static final String ASSERTION_FAILED = 
         "Assertion A14.6.9-3 (ProjectedSCODoesNotTrackChanges) failed: ";
 
-    private static final Date expectedDate = new Date(2007908); // pm
-    
+    private static final Date expectedDate;
+
+    static {
+        Calendar cal = Calendar.getInstance();
+        cal.set(1970, 0, 1, 0, 0, 0);
+        cal.set(Calendar.MILLISECOND, 0);
+        expectedDate = cal.getTime();
+    }    
+
     /**
      * The <code>main</code> is called when the class
      * is directly executed from the command line.
@@ -135,6 +143,7 @@ public class ProjectedSCODoesNotTrackCha
         query.setUnique(true);
         Date retrievedDate = (Date) query.execute();
         retrievedDate.setTime(123789L);
+
         if (JDOHelper.isDirty((Object)comp)) {
             appendMessage("Expected Company instance not to be dirty; "
                 + "actual state is " + getStateOfInstance((Object)comp));

Modified: db/jdo/trunk/tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java (original)
+++ db/jdo/trunk/tck/src/java/org/apache/jdo/tck/util/ConversionHelper.java Fri May 24 18:53:44
2013
@@ -56,6 +56,15 @@ public class ConversionHelper {
         }
     }
 
+    public static Date toUtilDate(String pattern, Locale locale, String value) {
+        SimpleDateFormat formatter = new SimpleDateFormat(pattern, locale);
+        try {
+            return formatter.parse(value);
+        } catch (ParseException e) {
+            throw new JDOFatalException("", e);
+        }
+    }
+
     /**
      * Converts the given array into a {@link Map}. 
      * The first dimension represents the map entries,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql Fri May 24 18:53:44 2013
@@ -250,7 +250,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -289,14 +289,14 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema1.sql Fri May 24 18:53:44 2013
@@ -52,7 +52,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -87,7 +87,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -99,7 +99,7 @@ CREATE TABLE persons (
 
 CREATE TABLE employees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema10.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema10.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema10.sql Fri May 24 18:53:44 2013
@@ -38,7 +38,7 @@ DROP TABLE companies;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
 
@@ -57,10 +57,10 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ORDER_COL INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema11.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema11.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema11.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema11.sql Fri May 24 18:53:44 2013
@@ -48,7 +48,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -87,14 +87,14 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema2.sql Fri May 24 18:53:44 2013
@@ -60,7 +60,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -95,7 +95,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -110,14 +110,14 @@ CREATE TABLE fulltimeemployees (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,
@@ -133,14 +133,14 @@ CREATE TABLE parttimeemployees (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema3.sql Fri May 24 18:53:44 2013
@@ -53,7 +53,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -88,7 +88,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -100,7 +100,7 @@ CREATE TABLE persons (
 
 CREATE TABLE parttimeemployees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,
@@ -114,7 +114,7 @@ CREATE TABLE parttimeemployees (
 
 CREATE TABLE fulltimeemployees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema4.sql Fri May 24 18:53:44 2013
@@ -48,7 +48,7 @@ DROP TABLE department_rooms;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -83,7 +83,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -95,7 +95,7 @@ CREATE TABLE persons (
 
 CREATE TABLE employees (
     PERSONID INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema9.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema9.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema9.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema9.sql Fri May 24 18:53:44 2013
@@ -38,7 +38,7 @@ DROP TABLE companies;
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (ID)
 );
 
@@ -57,10 +57,10 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE Not NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ROLE VARCHAR(32),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql Fri May 24 18:53:44 2013
@@ -179,7 +179,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -221,14 +221,14 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema1.sql Fri May 24 18:53:44 2013
@@ -53,7 +53,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -93,7 +93,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -106,7 +106,7 @@ CREATE TABLE persons (
 
 CREATE TABLE employees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema10.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema10.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema10.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema10.sql Fri May 24 18:53:44 2013
@@ -39,7 +39,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
@@ -60,10 +60,10 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ORDER_COL INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema11.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema11.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema11.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema11.sql Fri May 24 18:53:44 2013
@@ -49,7 +49,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -91,14 +91,14 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema2.sql Fri May 24 18:53:44 2013
@@ -61,7 +61,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -101,7 +101,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -118,14 +118,14 @@ CREATE TABLE fulltimeemployees (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,
@@ -153,14 +153,14 @@ CREATE TABLE parttimeemployees (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema3.sql Fri May 24 18:53:44 2013
@@ -54,7 +54,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -94,7 +94,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -107,7 +107,7 @@ CREATE TABLE persons (
 
 CREATE TABLE parttimeemployees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,
@@ -132,7 +132,7 @@ CREATE TABLE parttimeemployees (
 
 CREATE TABLE fulltimeemployees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER REFERENCES departments,
     FUNDINGDEPT INTEGER REFERENCES departments,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema4.sql Fri May 24 18:53:44 2013
@@ -49,7 +49,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -89,7 +89,7 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     ADDRID INTEGER,
     STREET VARCHAR(64),
     CITY VARCHAR(64),
@@ -102,7 +102,7 @@ CREATE TABLE persons (
 
 CREATE TABLE employees (
     DATASTORE_IDENTITY INTEGER NOT NULL,
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS DOUBLE,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema9.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema9.sql?rev=1486167&r1=1486166&r2=1486167&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema9.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema9.sql Fri May 24 18:53:44 2013
@@ -39,7 +39,7 @@ CREATE TABLE companies (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
-    FOUNDEDDATE TIMESTAMP NOT NULL,
+    FOUNDEDDATE DATE NOT NULL,
     CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
@@ -60,10 +60,10 @@ CREATE TABLE persons (
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
-    BIRTHDATE TIMESTAMP NOT NULL,
+    BIRTHDATE DATE NOT NULL,
     DISCRIMINATOR varchar(64) NOT NULL,
     ROLE VARCHAR(32),
-    HIREDATE TIMESTAMP,
+    HIREDATE DATE,
     WEEKLYHOURS REAL,
     DEPARTMENT INTEGER,
     FUNDINGDEPT INTEGER,



Mime
View raw message