db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tilma...@apache.org
Subject svn commit: r1777703 - in /db/jdo/trunk/tck/src: conf/ jdo/applicationidentity/org/apache/jdo/tck/pc/query/ jdo/datastoreidentity/org/apache/jdo/tck/pc/query/ orm/applicationidentity/org/apache/jdo/tck/pc/query/ orm/datastoreidentity/org/apache/jdo/tck...
Date Fri, 06 Jan 2017 19:47:15 GMT
Author: tilmannz
Date: Fri Jan  6 19:47:14 2017
New Revision: 1777703

URL: http://svn.apache.org/viewvc?rev=1777703&view=rev
Log:
Patch for JDO-751 - Support for Java 8 Optional

Modified:
    db/jdo/trunk/tck/src/conf/jdoql.conf
    db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
    db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
    db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
    db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql

Modified: db/jdo/trunk/tck/src/conf/jdoql.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/jdoql.conf?rev=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/jdoql.conf (original)
+++ db/jdo/trunk/tck/src/conf/jdoql.conf Fri Jan  6 19:47:14 2017
@@ -69,6 +69,7 @@ org.apache.jdo.tck.query.jdoql.methods.S
 org.apache.jdo.tck.query.jdoql.methods.SupportedListMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedMapMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedMathMethods \
+org.apache.jdo.tck.query.jdoql.methods.SupportedOptionalMethods \
 org.apache.jdo.tck.query.jdoql.methods.SupportedStringMethods \
 org.apache.jdo.tck.query.jdoql.operators.BinaryAddition \
 org.apache.jdo.tck.query.jdoql.operators.BinarySubtraction \

Modified: db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo?rev=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo (original)
+++ db/jdo/trunk/tck/src/jdo/applicationidentity/org/apache/jdo/tck/pc/query/package.jdo Fri
Jan  6 19:47:14 2017
@@ -37,6 +37,16 @@
       <field name="time" persistence-modifier="persistent"/>
     </class>
 
+     <class name="OptionalSample" identity-type="application">
+      <field name="id" primary-key="true"/>
+      <field name="optionalPC" 
+                   	field-type="org.apache.jdo.tck.pc.query.OptionalSample"
+                   	persistence-modifier="persistent"/>
+      <field name="optionalDate" persistence-modifier="persistent"/>
+      <field name="optionalInteger" persistence-modifier="persistent"/>
+      <field name="optionalString" persistence-modifier="persistent"/>
+    </class>
+
     <class name="MathSample" identity-type="application">
       <field name="id" primary-key="true"/>
       <field name="angle" persistence-modifier="persistent"/>

Modified: db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo?rev=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo (original)
+++ db/jdo/trunk/tck/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/query/package.jdo Fri
Jan  6 19:47:14 2017
@@ -28,6 +28,15 @@
       <field name="time" persistence-modifier="persistent"/>
     </class>
 
+    <class name="OptionalSample">
+      <field name="optionalPC" 
+                   	field-type="org.apache.jdo.tck.pc.query.OptionalSample"
+                   	persistence-modifier="persistent"/>
+      <field name="optionalDate" persistence-modifier="persistent"/>
+      <field name="optionalInteger" persistence-modifier="persistent"/>
+      <field name="optionalString" persistence-modifier="persistent"/>
+    </class>
+
     <class name="MathSample">
       <field name="angle" persistence-modifier="persistent"/>
       <field name="trigValue" persistence-modifier="persistent"/>

Modified: db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm?rev=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
(original)
+++ db/jdo/trunk/tck/src/orm/applicationidentity/org/apache/jdo/tck/pc/query/package-standard.orm
Fri Jan  6 19:47:14 2017
@@ -34,6 +34,23 @@
       <field name="time" column="TIME"/>
     </class>
 
+    <class name="OptionalSample" table="OptionalSample">
+      <field name="id" column="ID"/>
+      <field name="optionalPC">
+        <column name="OPTIONAL_PC"/>
+        <foreign-key/>
+      </field>
+      <field name="optionalDate">
+        <column name="OPTIONAL_DATE"/>
+      </field>
+      <field name="optionalInteger">
+        <column name="OPTIONAL_INTEGER"/>
+      </field>
+      <field name="optionalString">
+        <column name="OPTIONAL_STRING"/>
+      </field>
+    </class>
+   
     <class name="MathSample" table="MathSample">
       <field name="id" column="ID"/>
       <field name="angle">

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm?rev=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
(original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/query/package-standard.orm
Fri Jan  6 19:47:14 2017
@@ -40,6 +40,24 @@ This file contains the schema informatio
       <field name="time" column="TIME"/>
     </class>
 
+   <class name="OptionalSample" table="OptionalSample">
+      <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+      <field name="id" column="ID"/>
+      <field name="optionalPC">
+        <column name="OPTIONAL_PC"/>
+        <foreign-key/>
+      </field>
+      <field name="optionalDate">
+        <column name="OPTIONAL_DATE"/>
+      </field>
+      <field name="optionalInteger">
+        <column name="OPTIONAL_INTEGER"/>
+      </field>
+      <field name="optionalString">
+        <column name="OPTIONAL_STRING"/>
+      </field>
+    </class>
+ 
     <class name="MathSample" table="MathSample">
       <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
       <field name="id" column="ID"/>

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=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/applicationidentity/schema.sql Fri Jan  6 19:47:14 2017
@@ -136,6 +136,7 @@ CREATE TABLE PCClass (
 DROP TABLE JDOQLKeywordsAsFieldNames;
 DROP TABLE NoExtent;
 DROP TABLE TimeSample;
+DROP TABLE OptionalSample;
 DROP TABLE MathSample;
 
 CREATE TABLE JDOQLKeywordsAsFieldNames (
@@ -154,6 +155,15 @@ CREATE TABLE TimeSample (
     CONSTRAINT TIMESAMPLE_PK PRIMARY KEY (ID)
 );
 
+CREATE TABLE OptionalSample (
+    ID INTEGER NOT NULL,
+	OPTIONAL_PC INTEGER REFERENCES OptionalSample ON DELETE NO ACTION,
+	OPTIONAL_DATE DATE,
+	OPTIONAL_INTEGER INTEGER,
+	OPTIONAL_STRING VARCHAR(255),
+    CONSTRAINT OPTIONALSAMPLE_PK PRIMARY KEY (ID)
+);
+
 CREATE TABLE MathSample (
     ID INTEGER NOT NULL,
     ANGLE DECIMAL(18,8),

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=1777703&r1=1777702&r2=1777703&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema.sql Fri Jan  6 19:47:14 2017
@@ -122,6 +122,7 @@ CREATE TABLE PCClass (
 DROP TABLE JDOQLKeywordsAsFieldNames;
 DROP TABLE NoExtent;
 DROP TABLE TimeSample;
+DROP TABLE OptionalSample;
 DROP TABLE MathSample;
 
 CREATE TABLE JDOQLKeywordsAsFieldNames (
@@ -143,6 +144,16 @@ CREATE TABLE TimeSample (
     CONSTRAINT TIMESAMPLE_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
+CREATE TABLE OptionalSample (
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
+	OPTIONAL_PC INTEGER REFERENCES OptionalSample ON DELETE NO ACTION,
+	OPTIONAL_DATE DATE,
+	OPTIONAL_INTEGER INTEGER,
+	OPTIONAL_STRING VARCHAR(255),
+    CONSTRAINT OPTIONALSAMPLE_PK PRIMARY KEY (DATASTORE_IDENTITY)
+);
+
 CREATE TABLE MathSample (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     ID INTEGER NOT NULL,



Mime
View raw message