Author: mbo
Date: Wed Feb 29 21:27:28 2012
New Revision: 1295288

URL: http://svn.apache.org/viewvc?rev=1295288&view=rev
Log:
JDO-682: Change datastore-identity strategy for shoppingcart pc classes to sequence

Modified:
    db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
    db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema8.sql

Modified: db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm?rev=1295288&r1=1295287&r2=1295288&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm (original)
+++ db/jdo/trunk/tck/src/orm/datastoreidentity/org/apache/jdo/tck/pc/shoppingcart/package-standard8.orm Wed Feb 29 21:27:28 2012
@@ -25,8 +25,11 @@ has datastore identity.
 	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
     <package name="org.apache.jdo.tck.pc.shoppingcart">
 
+        <sequence name="id_seq" datastore-sequence="datastore_seq"/>
+
         <class name="Cart" table="CARTS">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <datastore-identity strategy="sequence" sequence="id_seq" 
+                                column="DATASTORE_ID"/>
             <version strategy="version-number" column="VERSION"/>
 
             <field name="id" column="CART_ID"/>
@@ -35,7 +38,8 @@ has datastore identity.
         </class>
 
         <class name="CartEntry" table="CART_ENTRIES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <datastore-identity strategy="sequence" sequence="id_seq" 
+                                column="DATASTORE_ID"/>
             <version strategy="version-number" column="VERSION"/>
 
             <field name="id" column="ID"/>
@@ -53,7 +57,8 @@ has datastore identity.
         </class>
 
         <class name="Undetachable" table="UNDETACHABLES">
-            <datastore-identity strategy="increment" column="DATASTORE_ID"/>
+            <datastore-identity strategy="sequence" sequence="id_seq" 
+                                column="DATASTORE_ID"/>
             <version strategy="version-number" column="VERSION"/>
 
             <field name="id" column="ID"/>

Modified: db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema8.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema8.sql?rev=1295288&r1=1295287&r2=1295288&view=diff
==============================================================================
--- db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema8.sql (original)
+++ db/jdo/trunk/tck/src/sql/derby/datastoreidentity/schema8.sql Wed Feb 29 21:27:28 2012
@@ -20,11 +20,14 @@ connect 'jdbc:derby:jdotckdb;create=true
 CREATE SCHEMA datastoreidentity8;
 SET SCHEMA datastoreidentity8;
 
+DROP SEQUENCE DATASTORE_SEQ;
 DROP TABLE CART_ENTRIES;
 DROP TABLE CARTS;
 DROP TABLE PRODUCTS;
 DROP TABLE UNDETACHABLES;
 
+CREATE SEQUENCE DATASTORE_SEQ AS BIGINT START WITH 1;
+
 CREATE TABLE CARTS (
 
     DATASTORE_ID BIGINT NOT NULL,