svn commit: r1300737 - in /db/jdo/trunk/tck/src: conf/jdori-pmf.properties orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm sql/derby/datastoreidentity/schema12.sql

[mb...@apache.org]

Author: mbo
Date: Wed Mar 14 21:45:56 2012
New Revision: 1300737

URL: http://svn.apache.org/viewvc?rev=1300737&view=rev
Log:
JDO-682: change datastore-identity strategy for building pc classes to sequence; set datanucleus PMF property autoCreateTable=false

Modified:
    db/jdo/trunk/tck/src/conf/jdori-pmf.properties
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema12.sql

Modified: db/jdo/trunk/tck/src/conf/jdori-pmf.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/conf/jdori-pmf.properties?rev=1300737&r1=1300736&r2=1300737&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/conf/jdori-pmf.properties (original)
+++ db/jdo/trunk/tck/src/conf/jdori-pmf.properties Wed Mar 14 21:45:56 2012
@@ -33,7 +33,7 @@ datanucleus.metadata.validate=false
 datanucleus.validateTables=false
 datanucleus.validateConstraints=false
 datanucleus.autoCreateSchema=false
-datanucleus.autoCreateTables=true
+datanucleus.autoCreateTables=false
 datanucleus.autoCreateConstraints=false
 datanucleus.autoCreateColumns=false
 datanucleus.rdbms.CheckExistTablesOrViews=false

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm?rev=1300737&r1=1300736&r2=1300737&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/building/package-standard12.orm Wed Mar 14 21:45:56 2012
@@ -22,9 +22,12 @@ This file contains the schema informatio
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
 	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
-    <package name="org.apache.jdo.tck.pc.building">
+    <package name="org.apache.jdo.tck.pc.building" schema="datastoreidentity12">
+
+        <sequence name="id_seq" datastore-sequence="DATASTORE_SEQ"/>
+
         <class name="Kitchen" table="KITCHEN">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <datastore-identity strategy="sequence" sequence="id_seq"  column="DATASTORE_ID"/>
             <field name="id" column="KITCHEN_ID"/>
             <field name="oven">
                 <embedded null-indicator-column="OVEN_MAKE">

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema12.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema12.sql?rev=1300737&r1=1300736&r2=1300737&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema12.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema12.sql Wed Mar 14 21:45:56 2012
@@ -20,8 +20,11 @@ connect 'jdbc:derby:jdotckdb;create=true
 CREATE SCHEMA datastoreidentity12;
 SET SCHEMA datastoreidentity12;
 
+DROP SEQUENCE DATASTORE_SEQ;
 DROP TABLE KITCHEN;
 
+CREATE SEQUENCE DATASTORE_SEQ AS BIGINT START WITH 1;
+
 CREATE TABLE KITCHEN (
     DATASTORE_ID BIGINT NOT NULL,
     KITCHEN_ID BIGINT NOT NULL,