db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r188795 [3/3] - in /incubator/jdo/trunk/tck20/test: jdo/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ jdo/datastoreidentity/org/apache/jdo/tck/pc/company/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ jdo/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ jdo/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ jdo/datastoreidentity/org/apache/jdo/tck/pc/mylib/ orm/applicationidentity/org/apache/jdo/tck/pc/lifecycle/ orm/datastoreidentity/org/apache/jdo/tck/pc/company/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/inheritance/ orm/datastoreidentity/org/apache/jdo/tck/pc/instancecallbacks/ orm/datastoreidentity/org/apache/jdo/tck/pc/lifecycle/ orm/datastoreidentity/org/apache/jdo/tck/pc/mylib/ sql/derby/
Date Tue, 07 Jun 2005 15:16:08 GMT
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=188795&r1=188794&r2=188795&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Tue Jun  7 08:16:04 2005
@@ -1,4 +1,4 @@
--- SchemaType: application identity
+-- SchemaType: datastore identity
 
 connect 'jdbc:derby:jdotckdb;create=true' user 'tckuser' password 'tckuser';
 
@@ -12,35 +12,39 @@
 DROP TABLE PrimitiveTypes;
 
 CREATE TABLE PCPoint (
-    ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT NOT NULL,
     X INTEGER NOT NULL,
     Y INTEGER,
-    CONSTRAINT PCPNT_CONST PRIMARY KEY (ID)
+    CONSTRAINT PCPNT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE PCPoint2 (
-    ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT NOT NULL,
     X INTEGER NOT NULL,
     Y INTEGER,
-    CONSTRAINT PCPNT2_CONST PRIMARY KEY (ID)
+    CONSTRAINT PCPNT2_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE PCRect (
-    ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT NOT NULL,
     UPPER_LEFT BIGINT REFERENCES PCPoint NOT NULL,
     LOWER_RIGHT BIGINT REFERENCES PCPoint NOT NULL,
-    CONSTRAINT PCRCT_CONST PRIMARY KEY (ID)
+    CONSTRAINT PCRCT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE PrimitiveTypes (
-    ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID BIGINT 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,
     shortNotNull SMALLINT NOT NULL,
-    shortNull SMALLINT NOT NULL,
-    intNotNull INTEGER,
+    shortNull SMALLINT,
+    intNotNull INTEGER NOT NULL,
     intNull INTEGER,
     longNotNull INTEGER NOT NULL,
     longNull INTEGER,
@@ -52,10 +56,10 @@
     charNull CHAR,
     dateNull DATE,
     stringNull VARCHAR (256),
-    bigDecimal DECIMAL NOT NULL,
-    bigInteger INTEGER NOT NULL,
-    PrimitiveTypes INTEGER NOT NULL,
-    CONSTRAINT PT_CONST PRIMARY KEY (ID)
+    bigDecimal DECIMAL,
+    bigInteger INTEGER,
+    PrimitiveTypes INTEGER,
+    CONSTRAINT PT_CONST PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 -------------------------
@@ -73,7 +77,8 @@
 DROP TABLE companies;
 
 CREATE TABLE companies (
-    ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     FOUNDEDDATE VARCHAR(32) NOT NULL,
     STREET VARCHAR(64),
@@ -81,19 +86,21 @@
     STATE CHAR(2),
     ZIPCODE CHAR(5),
     COUNTRY VARCHAR(64),
-    CONSTRAINT COMPS_PK PRIMARY KEY (ID)
+    CONSTRAINT COMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE departments (
-    ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     EMP_OF_THE_MONTH INTEGER,
     COMPANYID INTEGER REFERENCES companies,
-    CONSTRAINT DEPTS_PK PRIMARY KEY (ID)
+    CONSTRAINT DEPTS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE persons (
-    PERSONID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    PERSONID INTEGER NOT NULL,
     FIRSTNAME VARCHAR(32) NOT NULL,
     LASTNAME VARCHAR(32) NOT NULL,
     MIDDLENAME VARCHAR(32),
@@ -113,24 +120,26 @@
     SALARY FLOAT,
     WAGE FLOAT,
     DISCRIMINATOR varchar(64) NOT NULL,
-    CONSTRAINT EMPS_PK PRIMARY KEY (PERSONID)
+    CONSTRAINT EMPS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE insuranceplans (
-    INSID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    INSID INTEGER NOT NULL,
     CARRIER VARCHAR(64) NOT NULL,
     LIFETIME_ORTHO_BENEFIT DECIMAL,
     PLANTYPE VARCHAR(8),
     DISCRIMINATOR varchar(64) NOT NULL,
     EMPLOYEE INTEGER REFERENCES persons,
-    CONSTRAINT INS_PK PRIMARY KEY (INSID)
+    CONSTRAINT INS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE projects (
-    PROJID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    PROJID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
     BUDGET DECIMAL(11,2) NOT NULL,
-    CONSTRAINT PROJS_PK PRIMARY KEY (PROJID)
+    CONSTRAINT PROJS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE project_reviewer (
@@ -151,7 +160,7 @@
 
 ALTER TABLE departments 
     ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
-        (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID)
+        (EMP_OF_THE_MONTH) REFERENCES persons(DATASTORE_IDENTITY)
 ;
 
 -------------------------
@@ -681,7 +690,8 @@
 
 CREATE TABLE ALLTYPES
 (
-    ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    ID INTEGER NOT NULL,
     PRIMITIVEBOOLEAN CHAR(1)CHECK (PRIMITIVEBOOLEAN IN ('Y','N')),
     PRIMITIVEBYTE SMALLINT,
     PRIMITIVECHAR INTEGER,
@@ -705,11 +715,12 @@
     BIGINTEGERVAL BIGINT
 );
 
-ALTER TABLE ALLTYPES ADD CONSTRAINT ALLTYPES_PK PRIMARY KEY (ID);
+ALTER TABLE ALLTYPES ADD CONSTRAINT ALLTYPES_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFBIGDECIMAL
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BIG_DECIMAL0 DECIMAL(11,4),
     BIG_DECIMAL1 DECIMAL(11,4),
     BIG_DECIMAL102 DECIMAL(11,4),
@@ -784,11 +795,12 @@
     BIG_DECIMAL94 DECIMAL(11,4)
 );
 
-ALTER TABLE FIELDSOFBIGDECIMAL ADD CONSTRAINT FIELDSOFBIGDPP_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFBIGDECIMAL ADD CONSTRAINT FIELDSOFBIGDPP_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFBIGINTEGER
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BIG_INTEGER0 BIGINT,
     BIG_INTEGER1 BIGINT,
     BIG_INTEGER102 BIGINT,
@@ -863,11 +875,12 @@
     BIG_INTEGER94 BIGINT
 );
 
-ALTER TABLE FIELDSOFBIGINTEGER ADD CONSTRAINT FIELDSOFBIGI2S_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFBIGINTEGER ADD CONSTRAINT FIELDSOFBIGI2S_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFBOOLEAN
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BOOLEAN0 CHAR(1) CHECK (BOOLEAN0 IN ('Y','N') OR BOOLEAN0 IS NULL),
     BOOLEAN1 CHAR(1) CHECK (BOOLEAN1 IN ('Y','N') OR BOOLEAN1 IS NULL),
     BOOLEAN102 CHAR(1) CHECK (BOOLEAN102 IN ('Y','N') OR BOOLEAN102 IS NULL),
@@ -942,11 +955,12 @@
     BOOLEAN94 CHAR(1) CHECK (BOOLEAN94 IN ('Y','N') OR BOOLEAN94 IS NULL)
 );
 
-ALTER TABLE FIELDSOFBOOLEAN ADD CONSTRAINT FIELDSOFBOOLS2_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFBOOLEAN ADD CONSTRAINT FIELDSOFBOOLS2_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFCHARACTER
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     CHARACTER0 INTEGER,
     CHARACTER1 INTEGER,
     CHARACTER102 INTEGER,
@@ -1021,11 +1035,12 @@
     CHARACTER94 INTEGER
 );
 
-ALTER TABLE FIELDSOFCHARACTER ADD CONSTRAINT FIELDSOFCHAROV_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFCHARACTER ADD CONSTRAINT FIELDSOFCHAROV_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFDATE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     DATE0 TIMESTAMP,
     DATE1 TIMESTAMP,
     DATE102 TIMESTAMP,
@@ -1100,11 +1115,12 @@
     DATE94 TIMESTAMP
 );
 
-ALTER TABLE FIELDSOFDATE ADD CONSTRAINT FIELDSOFDATE_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFDATE ADD CONSTRAINT FIELDSOFDATE_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFDOUBLE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     DOUBLE0 DOUBLE,
     DOUBLE1 DOUBLE,
     DOUBLE102 DOUBLE,
@@ -1179,11 +1195,12 @@
     DOUBLE94 DOUBLE
 );
 
-ALTER TABLE FIELDSOFDOUBLE ADD CONSTRAINT FIELDSOFDOUBLE_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFDOUBLE ADD CONSTRAINT FIELDSOFDOUBLE_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFFLOAT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     FLOAT0 FLOAT,
     FLOAT1 FLOAT,
     FLOAT102 FLOAT,
@@ -1258,11 +1275,12 @@
     FLOAT94 FLOAT
 );
 
-ALTER TABLE FIELDSOFFLOAT ADD CONSTRAINT FIELDSOFFLOAT_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFFLOAT ADD CONSTRAINT FIELDSOFFLOAT_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFINTEGER
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     INTEGER0 INTEGER,
     INTEGER1 INTEGER,
     INTEGER102 INTEGER,
@@ -1337,11 +1355,12 @@
     INTEGER94 INTEGER
 );
 
-ALTER TABLE FIELDSOFINTEGER ADD CONSTRAINT FIELDSOFINTEV0_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFINTEGER ADD CONSTRAINT FIELDSOFINTEV0_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFLOCALE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     LOCALE0 CHAR(20),
     LOCALE1 CHAR(20),
     LOCALE102 CHAR(20),
@@ -1416,11 +1435,12 @@
     LOCALE94 CHAR(20)
 );
 
-ALTER TABLE FIELDSOFLOCALE ADD CONSTRAINT FIELDSOFLOCALE_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFLOCALE ADD CONSTRAINT FIELDSOFLOCALE_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFLONG
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     LONG0 BIGINT,
     LONG1 BIGINT,
     LONG102 BIGINT,
@@ -1495,11 +1515,12 @@
     LONG94 BIGINT
 );
 
-ALTER TABLE FIELDSOFLONG ADD CONSTRAINT FIELDSOFLONG_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFLONG ADD CONSTRAINT FIELDSOFLONG_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFOBJECT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     OBJECT1 LONG VARCHAR FOR BIT DATA,
     OBJECT102 LONG VARCHAR FOR BIT DATA,
     OBJECT103 LONG VARCHAR FOR BIT DATA,
@@ -1566,11 +1587,12 @@
     OBJECT94 LONG VARCHAR FOR BIT DATA
 );
 
-ALTER TABLE FIELDSOFOBJECT ADD CONSTRAINT FIELDSOFOBJECT_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFOBJECT ADD CONSTRAINT FIELDSOFOBJECT_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFSIMPLEINTERFACE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     SIMPLEINTERFACE1 LONG VARCHAR FOR BIT DATA,
     SIMPLEINTERFACE102 LONG VARCHAR FOR BIT DATA,
     SIMPLEINTERFACE103 LONG VARCHAR FOR BIT DATA,
@@ -1637,11 +1659,12 @@
     SIMPLEINTERFACE94 LONG VARCHAR FOR BIT DATA
 );
 
-ALTER TABLE FIELDSOFSIMPLEINTERFACE ADD CONSTRAINT FOSI_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFSIMPLEINTERFACE ADD CONSTRAINT FOSI_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVEBOOLEAN
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BOOLEAN0 CHAR(1) NOT NULL CHECK (BOOLEAN0 IN ('Y','N')),
     BOOLEAN1 CHAR(1) NOT NULL CHECK (BOOLEAN1 IN ('Y','N')),
     BOOLEAN102 CHAR(1) NOT NULL CHECK (BOOLEAN102 IN ('Y','N')),
@@ -1716,11 +1739,12 @@
     BOOLEAN94 CHAR(1) NOT NULL CHECK (BOOLEAN94 IN ('Y','N'))
 );
 
-ALTER TABLE FIELDSOFPRIMITIVEBOOLEAN ADD CONSTRAINT FIELDSOFPRIMC2_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVEBOOLEAN ADD CONSTRAINT FIELDSOFPRIMC2_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVEBYTE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BYTE0 SMALLINT NOT NULL,
     BYTE1 SMALLINT NOT NULL,
     BYTE102 SMALLINT NOT NULL,
@@ -1795,11 +1819,12 @@
     BYTE94 SMALLINT NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVEBYTE ADD CONSTRAINT FIELDSOFPRIMSD_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVEBYTE ADD CONSTRAINT FIELDSOFPRIMSD_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVECHAR
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     CHAR0 INTEGER NOT NULL,
     CHAR1 INTEGER NOT NULL,
     CHAR102 INTEGER NOT NULL,
@@ -1874,11 +1899,12 @@
     CHAR94 INTEGER NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVECHAR ADD CONSTRAINT FIELDSOFPRIMQ3_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVECHAR ADD CONSTRAINT FIELDSOFPRIMQ3_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVEDOUBLE
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     DOUBLE0 DOUBLE NOT NULL,
     DOUBLE1 DOUBLE NOT NULL,
     DOUBLE102 DOUBLE NOT NULL,
@@ -1953,11 +1979,12 @@
     DOUBLE94 DOUBLE NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVEDOUBLE ADD CONSTRAINT FIELDSOFPRIMHH_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVEDOUBLE ADD CONSTRAINT FIELDSOFPRIMHH_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVEFLOAT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     FLOAT0 FLOAT NOT NULL,
     FLOAT1 FLOAT NOT NULL,
     FLOAT102 FLOAT NOT NULL,
@@ -2032,11 +2059,12 @@
     FLOAT94 FLOAT NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVEFLOAT ADD CONSTRAINT FIELDSOFPRIMR3_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVEFLOAT ADD CONSTRAINT FIELDSOFPRIMR3_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVEINT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     INT0 INTEGER NOT NULL,
     INT1 INTEGER NOT NULL,
     INT102 INTEGER NOT NULL,
@@ -2111,11 +2139,12 @@
     INT94 INTEGER NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVEINT ADD CONSTRAINT FIELDSOFPRIMT6_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVEINT ADD CONSTRAINT FIELDSOFPRIMT6_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVELONG
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     LONG0 BIGINT NOT NULL,
     LONG1 BIGINT NOT NULL,
     LONG102 BIGINT NOT NULL,
@@ -2190,11 +2219,12 @@
     LONG94 BIGINT NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVELONG ADD CONSTRAINT FIELDSOFPRIMLL_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVELONG ADD CONSTRAINT FIELDSOFPRIMLL_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFPRIMITIVESHORT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     SHORT0 SMALLINT NOT NULL,
     SHORT1 SMALLINT NOT NULL,
     SHORT102 SMALLINT NOT NULL,
@@ -2269,11 +2299,12 @@
     SHORT94 SMALLINT NOT NULL
 );
 
-ALTER TABLE FIELDSOFPRIMITIVESHORT ADD CONSTRAINT FIELDSOFPRIMXB_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFPRIMITIVESHORT ADD CONSTRAINT FIELDSOFPRIMXB_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFSHORT
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     SHORT0 SMALLINT,
     SHORT1 SMALLINT,
     SHORT102 SMALLINT,
@@ -2348,11 +2379,12 @@
     SHORT94 SMALLINT
 );
 
-ALTER TABLE FIELDSOFSHORT ADD CONSTRAINT FIELDSOFSHORT_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFSHORT ADD CONSTRAINT FIELDSOFSHORT_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FIELDSOFSTRING
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     STRING0 VARCHAR(255),
     STRING1 VARCHAR(255),
     STRING102 VARCHAR(255),
@@ -2427,10 +2459,11 @@
     STRING94 VARCHAR(255)
 );
 
-ALTER TABLE FIELDSOFSTRING ADD CONSTRAINT FIELDSOFSTRING_PK PRIMARY KEY (IDENTIFIER);
+ALTER TABLE FIELDSOFSTRING ADD CONSTRAINT FIELDSOFSTRING_PK PRIMARY KEY (DATASTORE_IDENTITY);
 
 CREATE TABLE FieldsOfByte (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     BYTE0 SMALLINT,
     BYTE1 SMALLINT,
     BYTE2 SMALLINT,
@@ -2504,20 +2537,22 @@
     BYTE138 SMALLINT,
     BYTE139 SMALLINT,
     BYTE140 SMALLINT,
-    CONSTRAINT FieldsOfByte_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT FieldsOfByte_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE SIMPLE_CLASS
 (
-    IDENTIFIER BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER BIGINT NOT NULL,
     INTVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(128) NOT NULL,
-    CONSTRAINT SIMPLE_CLASS_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT SIMPLE_CLASS_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE FIELDSOFSIMPLECLASS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     SIMPLECLASS0 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS1 BIGINT REFERENCES SIMPLE_CLASS,
     SIMPLECLASS2 BIGINT REFERENCES SIMPLE_CLASS,
@@ -2626,7 +2661,8 @@
 
 CREATE TABLE ARRAY_COLLECTIONS
 (
-   IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+   DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+   IDENTIFIER INTEGER NOT NULL,
    ARRAY_OF_BIG_DECIMAL12 LONG VARCHAR FOR BIT DATA,
    ARRAY_OF_BIG_DECIMAL13 LONG VARCHAR FOR BIT DATA,
    ARRAY_OF_BIG_INTEGER14 LONG VARCHAR FOR BIT DATA,
@@ -2659,7 +2695,8 @@
 
 CREATE TABLE COLLECTION_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
     COLLECTION_OF_STRING9 BLOB,
     COLLECTION_OF_STRING10 BLOB,
     COLLECTION_OF_DATE12 BLOB,
@@ -2682,127 +2719,127 @@
     COLLECTION_OF_LONG37 BLOB,
     COLLECTION_OF_SHORT39 BLOB,
     COLLECTION_OF_SHORT40 BLOB,
-    CONSTRAINT CC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT CC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024)
 );
 
 
 CREATE TABLE COLLECTION_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT
 );
 
@@ -2810,7 +2847,8 @@
 
 CREATE TABLE LIST_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	LIST_OF_STRING9 BLOB,
 	LIST_OF_STRING10 BLOB,
 	LIST_OF_DATE12 BLOB,
@@ -2833,145 +2871,145 @@
 	LIST_OF_LONG37 BLOB,
 	LIST_OF_SHORT39 BLOB,
 	LIST_OF_SHORT40 BLOB,
-    CONSTRAINT LC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT LC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE LIST_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LIST_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -2980,7 +3018,8 @@
 
 CREATE TABLE ARRAYLIST_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	ARRAYLIST_OF_STRING9 BLOB,
 	ARRAYLIST_OF_STRING10 BLOB,
 	ARRAYLIST_OF_DATE12 BLOB,
@@ -3003,7 +3042,7 @@
 	ARRAYLIST_OF_LONG37 BLOB,
 	ARRAYLIST_OF_SHORT39 BLOB,
 	ARRAYLIST_OF_SHORT40 BLOB,
-    CONSTRAINT ALC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT ALC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE ARRAYLIST_OF_OBJECT0
@@ -3150,7 +3189,8 @@
 
 CREATE TABLE LINKEDLIST_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	LINKEDLIST_OF_STRING9 BLOB,
 	LINKEDLIST_OF_STRING10 BLOB,
 	LINKEDLIST_OF_DATE12 BLOB,
@@ -3173,145 +3213,145 @@
 	LINKEDLIST_OF_LONG37 BLOB,
 	LINKEDLIST_OF_SHORT39 BLOB,
 	LINKEDLIST_OF_SHORT40 BLOB,
-    CONSTRAINT LLC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT LLC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE LINKEDLIST_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE LINKEDLIST_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -3320,7 +3360,8 @@
 
 CREATE TABLE VECTOR_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	VECTOR_OF_STRING9 BLOB,
 	VECTOR_OF_STRING10 BLOB,
 	VECTOR_OF_DATE12 BLOB,
@@ -3343,145 +3384,145 @@
 	VECTOR_OF_LONG37 BLOB,
 	VECTOR_OF_SHORT39 BLOB,
 	VECTOR_OF_SHORT40 BLOB,
-    CONSTRAINT VC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT VC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE VECTOR_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE VECTOR_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -3490,7 +3531,8 @@
 
 CREATE TABLE SET_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	SET_OF_STRING9 BLOB,
 	SET_OF_STRING10 BLOB,
 	SET_OF_DATE12 BLOB,
@@ -3513,145 +3555,145 @@
 	SET_OF_LONG37 BLOB,
 	SET_OF_SHORT39 BLOB,
 	SET_OF_SHORT40 BLOB,
-    CONSTRAINT SC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT SC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE SET_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE SET_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -3660,7 +3702,8 @@
 
 CREATE TABLE HASHSET_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	HASHSET_OF_STRING9 BLOB,
 	HASHSET_OF_STRING10 BLOB,
 	HASHSET_OF_DATE12 BLOB,
@@ -3683,145 +3726,145 @@
 	HASHSET_OF_LONG37 BLOB,
 	HASHSET_OF_SHORT39 BLOB,
 	HASHSET_OF_SHORT40 BLOB,
-    CONSTRAINT HSC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT HSC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE HASHSET_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_LOCALE17
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_BIG_DECIMAL20
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER23
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_BYTE26
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_DOUBLE29
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_FLOAT32
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_INTEGER35
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_LONG38
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE HASHSET_OF_SHORT41
 (
-    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -3830,7 +3873,8 @@
 
 CREATE TABLE TREESET_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	TREESET_OF_STRING9 BLOB,
 	TREESET_OF_STRING10 BLOB,
 	TREESET_OF_DATE12 BLOB,
@@ -3851,138 +3895,138 @@
 	TREESET_OF_LONG34 BLOB,
 	TREESET_OF_SHORT36 BLOB,
 	TREESET_OF_SHORT37 BLOB,
-    CONSTRAINT TSC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT TSC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE TREESET_OF_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_STRING11
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_DATE14
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_BIG_DECIMAL17
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_BIG_INTEGER20
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_BYTE23
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_DOUBLE26
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_FLOAT29
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_INTEGER32
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_LONG35
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_SHORT38
 (
-    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
 );
@@ -3991,7 +4035,8 @@
 
 CREATE TABLE MAPSTRINGKEY_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	MAP_OF_STRING_STRING9 BLOB,
 	MAP_OF_STRING_STRING10 BLOB,
 	MAP_OF_STRING_STRING11 BLOB,
@@ -4080,12 +4125,12 @@
 	MAP_OF_STRING_LONG121 BLOB,
 	MAP_OF_STRING_SHORT123 BLOB,
 	MAP_OF_STRING_SHORT124 BLOB,
-    CONSTRAINT MSKC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT MSKC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4093,7 +4138,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4101,7 +4146,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4109,7 +4154,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4117,7 +4162,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4125,7 +4170,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4133,7 +4178,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4141,7 +4186,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4149,7 +4194,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4157,7 +4202,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT42
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4165,7 +4210,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT43
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4173,7 +4218,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT44
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4181,7 +4226,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS45
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4189,7 +4234,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS46
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4197,7 +4242,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS47
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4205,7 +4250,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE48
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4213,7 +4258,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE49
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4221,7 +4266,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE50
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4230,7 +4275,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT84
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4238,7 +4283,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT85
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4246,7 +4291,7 @@
 
 CREATE TABLE MAP_OF_STRING_OBJECT86
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4254,7 +4299,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS87
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4262,7 +4307,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS88
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4270,7 +4315,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS89
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4278,7 +4323,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE90
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4286,7 +4331,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE91
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4294,7 +4339,7 @@
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4302,7 +4347,7 @@
 
 CREATE TABLE MAP_OF_STRING_STRING95
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
@@ -4310,7 +4355,7 @@
 
 CREATE TABLE MAP_OF_STRING_DATE98
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
@@ -4318,7 +4363,7 @@
 
 CREATE TABLE MAP_OF_STRING_LOCALE101
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
@@ -4326,7 +4371,7 @@
 
 CREATE TABLE MAP_OF_STRING_BIG_DECIMAL104
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
@@ -4334,7 +4379,7 @@
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER107
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
@@ -4342,7 +4387,7 @@
 
 CREATE TABLE MAP_OF_STRING_BYTE110
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
@@ -4350,7 +4395,7 @@
 
 CREATE TABLE MAP_OF_STRING_DOUBLE113
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
@@ -4358,7 +4403,7 @@
 
 CREATE TABLE MAP_OF_STRING_FLOAT116
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
@@ -4366,7 +4411,7 @@
 
 CREATE TABLE MAP_OF_STRING_INTEGER119
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
@@ -4374,7 +4419,7 @@
 
 CREATE TABLE MAP_OF_STRING_LONG122
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
@@ -4382,7 +4427,7 @@
 
 CREATE TABLE MAP_OF_STRING_SHORT125
 (
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
@@ -4392,7 +4437,8 @@
 
 CREATE TABLE HASHMAPSTRINGKEY_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	HASHMAP_STR_STRING9 BLOB,
 	HASHMAP_STR_STRING10 BLOB,
 	HASHMAP_STR_STRING11 BLOB,
@@ -4481,12 +4527,12 @@
 	HASHMAP_STR_LONG121 BLOB,
 	HASHMAP_STR_SHORT123 BLOB,
 	HASHMAP_STR_SHORT124 BLOB,
-    CONSTRAINT HMSKC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT HMSKC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4494,7 +4540,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4502,7 +4548,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4510,7 +4556,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS3
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4518,7 +4564,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS4
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4526,7 +4572,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS5
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4534,7 +4580,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE6
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4542,7 +4588,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE7
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4550,7 +4596,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE8
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4558,7 +4604,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT42
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4566,7 +4612,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT43
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4574,7 +4620,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT44
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4582,7 +4628,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS45
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4590,7 +4636,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS46
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4598,7 +4644,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS47
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4606,7 +4652,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE48
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4614,7 +4660,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE49
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4622,7 +4668,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE50
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4631,7 +4677,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT84
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4639,7 +4685,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT85
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4647,7 +4693,7 @@
 
 CREATE TABLE HASHMAP_STR_OBJECT86
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4655,7 +4701,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS87
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4663,7 +4709,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS88
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4671,7 +4717,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4679,7 +4725,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE90
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4687,7 +4733,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE91
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4695,7 +4741,7 @@
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4703,7 +4749,7 @@
 
 CREATE TABLE HASHMAP_STR_STRING95
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     STRINGVAL VARCHAR(1024),
     INDEX INTEGER NOT NULL
@@ -4711,7 +4757,7 @@
 
 CREATE TABLE HASHMAP_STR_DATE98
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     DATEVAL DATE,
     INDEX INTEGER NOT NULL
@@ -4719,7 +4765,7 @@
 
 CREATE TABLE HASHMAP_STR_LOCALE101
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     LOCALEVAL CHAR(20),
     INDEX INTEGER NOT NULL
@@ -4727,7 +4773,7 @@
 
 CREATE TABLE HASHMAP_STR_BIG_DECIMAL104
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
     INDEX INTEGER NOT NULL
@@ -4735,7 +4781,7 @@
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER107
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BIG_INTEGERVAL BIGINT,
     INDEX INTEGER NOT NULL
@@ -4743,7 +4789,7 @@
 
 CREATE TABLE HASHMAP_STR_BYTE110
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     BYTEVAL SMALLINT,
     INDEX INTEGER NOT NULL
@@ -4751,7 +4797,7 @@
 
 CREATE TABLE HASHMAP_STR_DOUBLE113
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     DOUBLEVAL DOUBLE,
     INDEX INTEGER NOT NULL
@@ -4759,7 +4805,7 @@
 
 CREATE TABLE HASHMAP_STR_FLOAT116
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     FLOATVAL FLOAT,
     INDEX INTEGER NOT NULL
@@ -4767,7 +4813,7 @@
 
 CREATE TABLE HASHMAP_STR_INTEGER119
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     INTEGERVAL INTEGER,
     INDEX INTEGER NOT NULL
@@ -4775,7 +4821,7 @@
 
 CREATE TABLE HASHMAP_STR_LONG122
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     LONGVAL BIGINT,
     INDEX INTEGER NOT NULL
@@ -4783,7 +4829,7 @@
 
 CREATE TABLE HASHMAP_STR_SHORT125
 (
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     SHORTVAL SMALLINT,
     INDEX INTEGER NOT NULL
@@ -4793,7 +4839,8 @@
 
 CREATE TABLE HASHTABLESTRINGKEY_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER NOT NULL,
 	HASHTBL_STR_STRING9 BLOB,
 	HASHTBL_STR_STRING10 BLOB,
 	HASHTBL_STR_STRING11 BLOB,
@@ -4882,12 +4929,12 @@
 	HASHTBL_STR_LONG121 BLOB,
 	HASHTBL_STR_SHORT123 BLOB,
 	HASHTBL_STR_SHORT124 BLOB,
-    CONSTRAINT HTSKC_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT HTSKC_PK PRIMARY KEY (DATASTORE_IDENTITY)
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT0
 (
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4895,7 +4942,7 @@
 
 CREATE TABLE HASHTBL_STR_OBJECT1
 (
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4903,7 +4950,7 @@
 
 CREATE TABLE HASHTBL_STR_OBJECT2
 (
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
+    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL INTEGER NOT NULL,
     OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
     INDEX INTEGER NOT NULL
@@ -4911,7 +4958,7 @@
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS3
 (

[... 2042 lines stripped ...]


Mime
View raw message