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 2005/05/19 02:23:20 UTC

svn commit: r170844 - in /incubator/jdo/trunk/tck20/test: jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ orm/applicationidentity/org/apache/jdo/tck/pc/company/ orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/

Author: mcaisse
Date: Wed May 18 17:23:19 2005
New Revision: 170844

URL: http://svn.apache.org/viewcvs?rev=170844&view=rev
Log:
Fix various problems with schema, metadata

Modified:
    incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql

Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo Wed May 18 17:23:19 2005
@@ -12,6 +12,7 @@
         </class>
 
         <class name="Company" identity-type="datastore">
+            <field name="companyid" persistence-modifier="none"/>
             <field name="address"
                    persistence-modifier="persistent"/>
             <field name="departments" persistence-modifier="persistent">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-derby.orm Wed May 18 17:23:19 2005
@@ -96,7 +96,7 @@
                 </embedded>
             </field>
             <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="PERSONID"/>
+                <join column="EMPID"/>
                 <key column="TYPE"/>
                 <value column="PHONENO"/>
             </field>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm Wed May 18 17:23:19 2005
@@ -24,7 +24,7 @@
             <field name="fld_Locale" column="LOCALEVAL"/>
             <field name="fld_Date" column="DATEVAL"/>
             <field name="fld_BigDecimal">
-                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="25" scale="10"/>
             </field>
             <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm Wed May 18 17:23:19 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringKeyCollections" table="HASHMAPSTRINGKEY_COLLEC
+        <class name="HashMapStringKeyCollections" table="HASHMAPSTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Wed May 18 17:23:19 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects tableping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLEC
+        <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLECTIONS">
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="HashtableOfString_Object0" table="HASHTBL_OF_STR_OBJECT0">
                 <join column="IDENTIFIER"/>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-derby.orm Wed May 18 17:23:19 2005
@@ -96,13 +96,14 @@
                 </embedded>
             </field>
             <field name="phoneNumbers" table="employee_phoneno_type" >
-                <join column="PERSONID"/>
+                <join column="EMPID"/>
                 <key column="TYPE"/>
                 <value column="PHONENO"/>
             </field>
         </class>
 
         <class name="Insurance" table="insuranceplans">
+            <datastore-identity strategy="identity" column="INSID"/>
             <inheritance strategy="new-table">
                 <discriminator strategy="class-name" column="DISCRIMINATOR"/>
             </inheritance>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm Wed May 18 17:23:19 2005
@@ -24,7 +24,7 @@
             <field name="fld_Locale" column="LOCALEVAL"/>
             <field name="fld_Date" column="DATEVAL"/>
             <field name="fld_BigDecimal">
-                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="25" scale="10"/>
             </field>
             <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
         </class>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm Wed May 18 17:23:19 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects tableping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
+<!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata 2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="HashtableStringKeyCollections" table="HASHTABLESTRINGKEY_COLLECTIONS">

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Wed May 18 17:23:19 2005
@@ -34,24 +34,24 @@
 
 CREATE TABLE PrimitiveTypes (
     ID BIGINT NOT NULL,
-    booleanNotNull CHAR FOR BIT DATA NOT NULL,
-    booleanNull CHAR FOR BIT DATA NOT NULL,
+    booleanNotNull CHAR(1) NOT NULL CHECK (booleanNotNull IN ('Y','N')),
+    booleanNull CHAR(1) CHECK (booleanNull IN ('Y','N')),
     byteNotNull SMALLINT NOT NULL,
-    byteNull SMALLINT NOT NULL,
+    byteNull SMALLINT,
     shortNotNull SMALLINT NOT NULL,
     shortNull SMALLINT NOT NULL,
-    intNotNull INTEGER NOT NULL,
-    intNull INTEGER NOT NULL,
+    intNotNull INTEGER,
+    intNull INTEGER,
     longNotNull INTEGER NOT NULL,
-    longNull INTEGER NOT NULL,
+    longNull INTEGER,
     floatNotNull FLOAT NOT NULL,
-    floatNull FLOAT NOT NULL,
+    floatNull FLOAT,
     doubleNotNull FLOAT NOT NULL,
-    doubleNull FLOAT NOT NULL,
+    doubleNull FLOAT,
     charNotNull CHAR NOT NULL,
-    charNull CHAR NOT NULL,
-    dateNull DATE NOT NULL,
-    stringNull VARCHAR (256) NOT NULL,
+    charNull CHAR,
+    dateNull DATE,
+    stringNull VARCHAR (256),
     bigDecimal DECIMAL NOT NULL,
     bigInteger INTEGER NOT NULL,
     PrimitiveTypes INTEGER NOT NULL,
@@ -660,26 +660,26 @@
 CREATE TABLE ALLTYPES
 (
     ID INTEGER NOT NULL,
-    PRIMITIVEBOOLEAN CHAR(1) NOT NULL CHECK (PRIMITIVEBOOLEAN IN ('Y','N')),
-    PRIMITIVEBYTE SMALLINT NOT NULL,
-    PRIMITIVECHAR INTEGER NOT NULL,
-    PRIMITIVEDOUBLE DOUBLE NOT NULL,
-    PRIMITIVEFLOAT FLOAT NOT NULL,
-    PRIMITIVEINT INTEGER NOT NULL,
-    PRIMITIVELONG BIGINT NOT NULL,
-    PRIMITIVESHORT SMALLINT NOT NULL,
-    BOOLEANVAL CHAR(1) NOT NULL CHECK (BOOLEANVAL IN ('Y','N')),
-    BYTEVAL SMALLINT NOT NULL,
-    CHARACTERVAL CHAR(1) NOT NULL,
-    DOUBLEVAL DOUBLE NOT NULL,
-    FLOATVAL FLOAT NOT NULL,
-    INTEGERVAL INTEGER NOT NULL,
-    LONGVAL BIGINT NOT NULL,
-    SHORTVAL SMALLINT NOT NULL,
-    STRINGVAL VARCHAR(255) NOT NULL,
-    LOCALEVAL CHAR(20) NOT NULL,
-    DATEVAL DATE NOT NULL,
-    BIGDECIMALVAL DECIMAL(11,4)
+    PRIMITIVEBOOLEAN CHAR(1) CHECK (PRIMITIVEBOOLEAN IN ('Y','N')),
+    PRIMITIVEBYTE SMALLINT,
+    PRIMITIVECHAR INTEGER,
+    PRIMITIVEDOUBLE DOUBLE,
+    PRIMITIVEFLOAT FLOAT,
+    PRIMITIVEINT INTEGER,
+    PRIMITIVELONG BIGINT,
+    PRIMITIVESHORT SMALLINT,
+    BOOLEANVAL CHAR(1) CHECK (BOOLEANVAL IN ('Y','N')),
+    BYTEVAL SMALLINT,
+    CHARACTERVAL CHAR(1),
+    DOUBLEVAL DOUBLE,
+    FLOATVAL FLOAT,
+    INTEGERVAL INTEGER,
+    LONGVAL BIGINT,
+    SHORTVAL SMALLINT,
+    STRINGVAL VARCHAR(255),
+    LOCALEVAL CHAR(20),
+    DATEVAL DATE,
+    BIGDECIMALVAL DECIMAL(25,10),
     BIGINTEGERVAL BIGINT
 );
 

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=170844&r1=170843&r2=170844&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Wed May 18 17:23:19 2005
@@ -34,24 +34,24 @@
 
 CREATE TABLE PrimitiveTypes (
     ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
-    booleanNotNull CHAR FOR BIT DATA NOT NULL,
-    booleanNull CHAR FOR BIT DATA NOT NULL,
+    booleanNotNull CHAR(1) NOT NULL CHECK (booleanNotNull IN ('Y','N')),
+    booleanNull CHAR(1) CHECK (booleanNull IN ('Y','N')),
     byteNotNull SMALLINT NOT NULL,
-    byteNull SMALLINT NOT NULL,
+    byteNull SMALLINT,
     shortNotNull SMALLINT NOT NULL,
     shortNull SMALLINT NOT NULL,
-    intNotNull INTEGER NOT NULL,
-    intNull INTEGER NOT NULL,
+    intNotNull INTEGER,
+    intNull INTEGER,
     longNotNull INTEGER NOT NULL,
-    longNull INTEGER NOT NULL,
+    longNull INTEGER,
     floatNotNull FLOAT NOT NULL,
-    floatNull FLOAT NOT NULL,
+    floatNull FLOAT,
     doubleNotNull FLOAT NOT NULL,
-    doubleNull FLOAT NOT NULL,
+    doubleNull FLOAT,
     charNotNull CHAR NOT NULL,
-    charNull CHAR NOT NULL,
-    dateNull DATE NOT NULL,
-    stringNull VARCHAR (256) NOT NULL,
+    charNull CHAR,
+    dateNull DATE,
+    stringNull VARCHAR (256),
     bigDecimal DECIMAL NOT NULL,
     bigInteger INTEGER NOT NULL,
     PrimitiveTypes INTEGER NOT NULL,
@@ -93,7 +93,7 @@
 );
 
 CREATE TABLE persons (
-    PERSONID INTEGER NOT NULL,
+    PERSONID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
@@ -117,7 +117,7 @@
 );
 
 CREATE TABLE insuranceplans (
-    INSID INTEGER NOT NULL,
+    INSID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     CARRIER VARCHAR(64) NOT NULL,
     LIFETIME_ORTHO_BENEFIT DECIMAL,
     PLANTYPE VARCHAR(8),
@@ -127,7 +127,7 @@
 );
 
 CREATE TABLE projects (
-    PROJID INTEGER NOT NULL,
+    PROJID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     NAME VARCHAR(32) NOT NULL,
     BUDGET DECIMAL NOT NULL,
     CONSTRAINT PROJS_PK PRIMARY KEY (PROJID)
@@ -659,27 +659,27 @@
 
 CREATE TABLE ALLTYPES
 (
-    ID INTEGER NOT NULL,
-    PRIMITIVEBOOLEAN CHAR(1) NOT NULL CHECK (PRIMITIVEBOOLEAN IN ('Y','N')),
-    PRIMITIVEBYTE SMALLINT NOT NULL,
-    PRIMITIVECHAR INTEGER NOT NULL,
-    PRIMITIVEDOUBLE DOUBLE NOT NULL,
-    PRIMITIVEFLOAT FLOAT NOT NULL,
-    PRIMITIVEINT INTEGER NOT NULL,
-    PRIMITIVELONG BIGINT NOT NULL,
-    PRIMITIVESHORT SMALLINT NOT NULL,
-    BOOLEANVAL CHAR(1) NOT NULL CHECK (BOOLEANVAL IN ('Y','N')),
-    BYTEVAL SMALLINT NOT NULL,
-    CHARACTERVAL CHAR(1) NOT NULL,
-    DOUBLEVAL DOUBLE NOT NULL,
-    FLOATVAL FLOAT NOT NULL,
-    INTEGERVAL INTEGER NOT NULL,
-    LONGVAL BIGINT NOT NULL,
-    SHORTVAL SMALLINT NOT NULL,
-    STRINGVAL VARCHAR(255) NOT NULL,
-    LOCALEVAL CHAR(20) NOT NULL,
-    DATEVAL DATE NOT NULL,
-    BIGDECIMALVAL DECIMAL(11,4),
+    ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    PRIMITIVEBOOLEAN CHAR(1)CHECK (PRIMITIVEBOOLEAN IN ('Y','N')),
+    PRIMITIVEBYTE SMALLINT,
+    PRIMITIVECHAR INTEGER,
+    PRIMITIVEDOUBLE DOUBLE,
+    PRIMITIVEFLOAT FLOAT,
+    PRIMITIVEINT INTEGER,
+    PRIMITIVELONG BIGINT,
+    PRIMITIVESHORT SMALLINT,
+    BOOLEANVAL CHAR(1)CHECK (BOOLEANVAL IN ('Y','N')),
+    BYTEVAL SMALLINT,
+    CHARACTERVAL CHAR(1),
+    DOUBLEVAL DOUBLE,
+    FLOATVAL FLOAT,
+    INTEGERVAL INTEGER,
+    LONGVAL BIGINT,
+    SHORTVAL SMALLINT,
+    STRINGVAL VARCHAR(255),
+    LOCALEVAL CHAR(20),
+    DATEVAL DATE,
+    BIGDECIMALVAL DECIMAL(25,10),
     BIGINTEGERVAL BIGINT
 );
 
@@ -700,7 +700,7 @@
     BIG_DECIMAL112 DECIMAL(11,4),
     BIG_DECIMAL113 DECIMAL(11,4),
     BIG_DECIMAL114 DECIMAL(11,4),
-    BIG_DECIMAL111,4 DECIMAL(11,4),
+    BIG_DECIMAL111 DECIMAL(11,4),
     BIG_DECIMAL12 DECIMAL(11,4),
     BIG_DECIMAL120 DECIMAL(11,4),
     BIG_DECIMAL121 DECIMAL(11,4),
@@ -6963,7 +6963,7 @@
 DROP TABLE FieldSameName;
 
 CREATE TABLE AllPersist (
-    KEY_VALUE INTEGER NOT NULL,
+    KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     DOUBLE_B DOUBLE,
     INT_B INTEGER,
     FLOAT_E FLOAT,
@@ -6978,7 +6978,7 @@
 );
 
 CREATE TABLE TopNonPersistB (
-    KEY_VALUE INTEGER NOT NULL,
+    KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     DOUBLE_B DOUBLE,
     INT_B INTEGER,
     FLOAT_E FLOAT,
@@ -6993,7 +6993,7 @@
 );
 
 CREATE TABLE TopPersist (
-    KEY_VALUE INTEGER NOT NULL,
+    KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     DOUBLE_B DOUBLE,
     INT_B INTEGER,
     FLOAT_E FLOAT,
@@ -7008,7 +7008,7 @@
 );
 
 CREATE TABLE FieldSameName (
-    KEY_VALUE INTEGER NOT NULL,
+    KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     N2 DOUBLE,
     N3 INTEGER,
     FSN2_N3 FLOAT,
@@ -7030,7 +7030,7 @@
 DROP TABLE InstanceCallbacks;
 
 CREATE TABLE ICNonPersistFds (
-    ICKEY INTEGER NOT NULL,
+    ICKEY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     D DOUBLE,
     S SMALLINT,
     FLOATVAL FLOAT,
@@ -7039,7 +7039,7 @@
 );
 
 CREATE TABLE InstanceCallbacks (
-    ICKEY INTEGER NOT NULL,
+    ICKEY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     NAME VARCHAR(64),
     TIMEDATE TIMESTAMP,
     NEXTOBJ INTEGER,