db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r168257 - in /incubator/jdo/trunk/tck20/test: java/org/apache/jdo/tck/models/fieldtypes/ java/org/apache/jdo/tck/pc/fieldtypes/ orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/
Date Thu, 05 May 2005 04:00:51 GMT
Author: mcaisse
Date: Wed May  4 21:00:51 2005
New Revision: 168257

URL: http://svn.apache.org/viewcvs?rev=168257&view=rev
Log:
jdo-8 interim check-in

Added:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
  (with props)
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
  (with props)
Modified:
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java?rev=168257&r1=168256&r2=168257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
Wed May  4 21:00:51 2005
@@ -166,6 +166,18 @@
             Object[] val = pi.get(i);
 
             if(!Arrays.equals(val, compareWith)){
+                if (debug) {
+                    if ((compareWith != null) && (val != null)) {
+                        logger.debug("persistent instance = " + val.toString() +
+                                 "compareWith = " + compareWith.toString());
+                    }
+                    else {
+                        if (compareWith == null)
+                            logger.debug("Persistent instance is null."); 
+                        if (val == null)
+                            logger.debug("compareWith is null."); 
+                    }
+                }
                 fail(ASSERTION_FAILED,
                      "Incorrect value for " + ArrayCollections.fieldSpecs[i]);
             }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java?rev=168257&r1=168256&r2=168257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
(original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
Wed May  4 21:00:51 2005
@@ -21,7 +21,7 @@
 import java.util.Date;
 import java.io.Serializable;
 
-public class SimpleClass implements SimpleInterface, Comparable {
+public class SimpleClass implements Serializable, SimpleInterface, Comparable {
 
     private static long counter = new Date().getTime();
     private static long newId() {

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=168257&r1=168256&r2=168257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
Wed May  4 21:00:51 2005
@@ -9,32 +9,32 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
+                <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
+                <element column="OBJREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPCLSREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfSimpleInterface4" table="ARRAY_OF_SIMPLE_INTERFACE4">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPINTREF"/>
                 <order column="INDEX"/>
             </field>
             <field name="ArrayOfString6" table="ARRAY_OF_STRING6">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm?rev=168257&r1=168256&r2=168257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/CollectionCollections-derby.orm
Wed May  4 21:00:51 2005
@@ -6,39 +6,39 @@
             <field name="identifier" column="IDENTIFIER" primary-key="true"/>
             <field name="CollectionOfObject0" table="COLLECTION_OF_OBJECT0">
                 <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
+                <element column="OBJREF"/>
             </field>
             <field name="CollectionOfObject1" table="COLLECTION_OF_OBJECT1">
                 <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
+                <element column="OBJREF"/>
             </field>
             <field name="CollectionOfObject2" table="COLLECTION_OF_OBJECT2">
                 <join column="IDENTIFIER"/>
-                <element column="OBJVAL"/>
+                <element column="OBJREF"/>
             </field>
             <field name="CollectionOfSimpleClass3" table="COLLECTION_OF_SIMPLE_CLASS3">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPCLSREF"/>
             </field>
             <field name="CollectionOfSimpleClass4" table="COLLECTION_OF_SIMPLE_CLASS4">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPCLSREF"/>
             </field>
             <field name="CollectionOfSimpleClass5" table="COLLECTION_OF_SIMPLE_CLASS5">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPCLSREF"/>
             </field>
             <field name="CollectionOfSimpleInterface6" table="COLLECTION_OF_SIMPLE_INTERFACE6">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPINTREF"/>
             </field>
             <field name="CollectionOfSimpleInterface7" table="COLLECTION_OF_SIMPLE_INTERFACE7">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPINTREF"/>
             </field>
             <field name="CollectionOfSimpleInterface8" table="COLLECTION_OF_SIMPLE_INTERFACE8">
                 <join column="IDENTIFIER"/>
-                <element column="SIMPINTVAL"/>
+                <element column="SIMPINTREF"/>
             </field>
             <field name="CollectionOfString9" table="COLLECTION_OF_STRING9">
                 <join column="IDENTIFIER"/>

Added: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm?rev=168257&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
(added)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
Wed May  4 21:00:51 2005
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="FieldsOfSimpleClass" table="FIELDSOFSIMPLECLASS">
+            <field name="identifier" primary-key="true" column="IDENTIFIER"/>
+            <field name="SimpleClass0"  column="SIMPLECLASS0">
+            </field>
+            <field name="SimpleClass1"  column="SIMPLECLASS1">
+            </field>
+            <field name="SimpleClass2" column="SIMPLECLASS2">
+            </field>
+            <field name="SimpleClass3" column="SIMPLECLASS3">
+            </field>
+            <field name="SimpleClass4" column="SIMPLECLASS4">
+            </field>
+            <field name="SimpleClass5" column="SIMPLECLASS5">
+            </field>
+            <field name="SimpleClass6" column="SIMPLECLASS6">
+            </field>
+            <field name="SimpleClass7" column="SIMPLECLASS7">
+            </field>
+            <field name="SimpleClass10" column="SIMPLECLASS10">
+            </field>
+            <field name="SimpleClass11" column="SIMPLECLASS11">
+            </field>
+            <field name="SimpleClass12" column="SIMPLECLASS12">
+            </field>
+            <field name="SimpleClass13" column="SIMPLECLASS13">
+            </field>
+            <field name="SimpleClass14" column="SIMPLECLASS14">
+            </field>
+            <field name="SimpleClass16" column="SIMPLECLASS16">
+            </field>
+            <field name="SimpleClass17" column="SIMPLECLASS17">
+            </field>
+            <field name="SimpleClass18" column="SIMPLECLASS18">
+            </field>
+            <field name="SimpleClass19" column="SIMPLECLASS19">
+            </field>
+            <field name="SimpleClass20" column="SIMPLECLASS20">
+            </field>
+            <field name="SimpleClass21" column="SIMPLECLASS21">
+            </field>
+            <field name="SimpleClass22" column="SIMPLECLASS22">
+            </field>
+            <field name="SimpleClass23" column="SIMPLECLASS23">
+            </field>
+            <field name="SimpleClass29" column="SIMPLECLASS29">
+            </field>
+            <field name="SimpleClass30" column="SIMPLECLASS30">
+            </field>
+            <field name="SimpleClass31" column="SIMPLECLASS31">
+            </field>
+            <field name="SimpleClass32" column="SIMPLECLASS32">
+            </field>
+            <field name="SimpleClass33" column="SIMPLECLASS33">
+            </field>
+            <field name="SimpleClass36" column="SIMPLECLASS36">
+            </field>
+            <field name="SimpleClass37" column="SIMPLECLASS37">
+            </field>
+            <field name="SimpleClass38" column="SIMPLECLASS38">
+            </field>
+            <field name="SimpleClass39" column="SIMPLECLASS39">
+            </field>
+            <field name="SimpleClass40" column="SIMPLECLASS40">
+            </field>
+            <field name="SimpleClass41" column="SIMPLECLASS41">
+            </field>
+            <field name="SimpleClass42" column="SIMPLECLASS42">
+            </field>
+            <field name="SimpleClass43" column="SIMPLECLASS43">
+            </field>
+            <field name="SimpleClass46" column="SIMPLECLASS46">
+            </field>
+            <field name="SimpleClass47" column="SIMPLECLASS47">
+            </field>
+            <field name="SimpleClass48" column="SIMPLECLASS48">
+            </field>
+            <field name="SimpleClass49" column="SIMPLECLASS49">
+            </field>
+            <field name="SimpleClass50" column="SIMPLECLASS50">
+            </field>
+            <field name="SimpleClass52" column="SIMPLECLASS52">
+            </field>
+            <field name="SimpleClass53" column="SIMPLECLASS53">
+            </field>
+            <field name="SimpleClass54" column="SIMPLECLASS54">
+            </field>
+            <field name="SimpleClass55" column="SIMPLECLASS55">
+            </field>
+            <field name="SimpleClass56" column="SIMPLECLASS56">
+            </field>
+            <field name="SimpleClass57" column="SIMPLECLASS57">
+            </field>
+            <field name="SimpleClass58" column="SIMPLECLASS58">
+            </field>
+            <field name="SimpleClass59" column="SIMPLECLASS59">
+            </field>
+            <field name="SimpleClass65" column="SIMPLECLASS65">
+            </field>
+            <field name="SimpleClass66" column="SIMPLECLASS66">
+            </field>
+            <field name="SimpleClass67" column="SIMPLECLASS67">
+            </field>
+            <field name="SimpleClass68" column="SIMPLECLASS68">
+            </field>
+            <field name="SimpleClass69" column="SIMPLECLASS69">
+            </field>
+            <field name="SimpleClass72" column="SIMPLECLASS72">
+            </field>
+            <field name="SimpleClass73" column="SIMPLECLASS73">
+            </field>
+            <field name="SimpleClass74" column="SIMPLECLASS74">
+            </field>
+            <field name="SimpleClass75" column="SIMPLECLASS75">
+            </field>
+            <field name="SimpleClass76" column="SIMPLECLASS76">
+            </field>
+            <field name="SimpleClass77" column="SIMPLECLASS77">
+            </field>
+            <field name="SimpleClass78" column="SIMPLECLASS78">
+            </field>
+            <field name="SimpleClass79" column="SIMPLECLASS79">
+            </field>
+            <field name="SimpleClass82" column="SIMPLECLASS82">
+            </field>
+            <field name="SimpleClass83" column="SIMPLECLASS83">
+            </field>
+            <field name="SimpleClass84" column="SIMPLECLASS84">
+            </field>
+            <field name="SimpleClass85" column="SIMPLECLASS85">
+            </field>
+            <field name="SimpleClass86" column="SIMPLECLASS86">
+            </field>
+            <field name="SimpleClass88" column="SIMPLECLASS88">
+            </field>
+            <field name="SimpleClass89" column="SIMPLECLASS89">
+            </field>
+            <field name="SimpleClass90" column="SIMPLECLASS90">
+            </field>
+            <field name="SimpleClass91" column="SIMPLECLASS91">
+            </field>
+            <field name="SimpleClass92" column="SIMPLECLASS92">
+            </field>
+            <field name="SimpleClass93" column="SIMPLECLASS93">
+            </field>
+            <field name="SimpleClass94" column="SIMPLECLASS94">
+            </field>
+            <field name="SimpleClass95" column="SIMPLECLASS95">
+            </field>
+            <field name="SimpleClass101" column="SIMPLECLASS101">
+            </field>
+            <field name="SimpleClass102" column="SIMPLECLASS102">
+            </field>
+            <field name="SimpleClass103" column="SIMPLECLASS103">
+            </field>
+            <field name="SimpleClass104" column="SIMPLECLASS104">
+            </field>
+            <field name="SimpleClass105" column="SIMPLECLASS105">
+            </field>
+            <field name="SimpleClass108" column="SIMPLECLASS108">
+            </field>
+            <field name="SimpleClass109" column="SIMPLECLASS109">
+            </field>
+            <field name="SimpleClass110" column="SIMPLECLASS110">
+            </field>
+            <field name="SimpleClass111" column="SIMPLECLASS111">
+            </field>
+            <field name="SimpleClass112" column="SIMPLECLASS112">
+            </field>
+            <field name="SimpleClass113" column="SIMPLECLASS113">
+            </field>
+            <field name="SimpleClass114" column="SIMPLECLASS114">
+            </field>
+            <field name="SimpleClass115" column="SIMPLECLASS115">
+            </field>
+            <field name="SimpleClass118" column="SIMPLECLASS118">
+            </field>
+            <field name="SimpleClass119" column="SIMPLECLASS119">
+            </field>
+            <field name="SimpleClass120" column="SIMPLECLASS120">
+            </field>
+            <field name="SimpleClass121" column="SIMPLECLASS121">
+            </field>
+            <field name="SimpleClass122" column="SIMPLECLASS122">
+            </field>
+            <field name="SimpleClass124" column="SIMPLECLASS124">
+            </field>
+            <field name="SimpleClass125" column="SIMPLECLASS125">
+            </field>
+            <field name="SimpleClass126" column="SIMPLECLASS126">
+            </field>
+            <field name="SimpleClass127" column="SIMPLECLASS127">
+            </field>
+            <field name="SimpleClass128" column="SIMPLECLASS128">
+            </field>
+            <field name="SimpleClass129" column="SIMPLECLASS129">
+            </field>
+            <field name="SimpleClass130" column="SIMPLECLASS130">
+            </field>
+            <field name="SimpleClass131" column="SIMPLECLASS131">
+            </field>
+            <field name="SimpleClass137" column="SIMPLECLASS137">
+            </field>
+            <field name="SimpleClass138" column="SIMPLECLASS138">
+            </field>
+            <field name="SimpleClass139" column="SIMPLECLASS139">
+            </field>
+            <field name="SimpleClass140" column="SIMPLECLASS140">
+            </field>
+            <field name="SimpleClass141" column="SIMPLECLASS141">
+            </field>
+        </class>
+    </package>
+</orm>

Propchange: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleClass-derby.orm
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm?rev=168257&view=auto
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
(added)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
Wed May  4 21:00:51 2005
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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="SimpleClass" table="SIMPLE_CLASS">
+            <field name="id" primary-key="true" column="IDENTIFIER"/>
+            <field name="intField" column="INTVAL"/>
+            <field name="stringField" column="STRINGVAL"/>
+        </class>
+    </package>
+</orm>

Propchange: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/SimpleClass-derby.orm
------------------------------------------------------------------------------
    svn:executable = *

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=168257&r1=168256&r2=168257&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Wed May  4 21:00:51 2005
@@ -157,6 +157,8 @@
 --fieldtypes
 -------------------------
 
+DROP TABLE SIMPLE_CLASS;
+DROP TABLE FIELDSOFSIMPLECLASS;
 DROP TABLE FieldsOfByte;
 DROP TABLE FIELDSOFBIGDECIMAL;
 DROP TABLE FIELDSOFBIGINTEGER;
@@ -180,35 +182,36 @@
 DROP TABLE FIELDSOFSHORT;
 DROP TABLE FIELDSOFSTRING;
 DROP TABLE ARRAY_COLLECTIONS;
-DROP TABLE ARRAY_OF_BIG_DECIMAL12;
-DROP TABLE ARRAY_OF_BIG_DECIMAL13;
-DROP TABLE ARRAY_OF_BIG_INTEGER14;
-DROP TABLE ARRAY_OF_BIG_INTEGER15;
-DROP TABLE ARRAY_OF_BYTE16;
-DROP TABLE ARRAY_OF_BYTE17;
-DROP TABLE ARRAY_OF_DATE8;
-DROP TABLE ARRAY_OF_DATE9;
-DROP TABLE ARRAY_OF_DOUBLE18;
-DROP TABLE ARRAY_OF_DOUBLE19;
-DROP TABLE ARRAY_OF_FLOAT20;
-DROP TABLE ARRAY_OF_FLOAT21;
-DROP TABLE ARRAY_OF_INTEGER22;
-DROP TABLE ARRAY_OF_INTEGER23;
-DROP TABLE ARRAY_OF_LOCALE10;
-DROP TABLE ARRAY_OF_LOCALE11;
-DROP TABLE ARRAY_OF_LONG24;
-DROP TABLE ARRAY_OF_LONG25;
-DROP TABLE ARRAY_OF_OBJECT0;
-DROP TABLE ARRAY_OF_OBJECT1;
-DROP TABLE ARRAY_OF_SHORT26;
-DROP TABLE ARRAY_OF_SHORT27;
-DROP TABLE ARRAY_OF_SIMPLE_CLASS2;
-DROP TABLE ARRAY_OF_SIMPLE_CLASS3;
-DROP TABLE ARRAY_OF_SIMPLE_INTERFACE4;
-DROP TABLE ARRAY_OF_SIMPLE_INTERFACE5;
-DROP TABLE ARRAY_OF_STRING6;
-DROP TABLE ARRAY_OF_STRING7;
-DROP TABLE ARRAYLISTCOLLECTIONS;
+DROP TABLE COLLECTION_COLLECTIONS;
+DROP TABLE COLLECTION_OF_OBJECT0;
+DROP TABLE COLLECTION_OF_OBJECT1;
+DROP TABLE COLLECTION_OF_SIMPLE_CLASS2;
+DROP TABLE COLLECTION_OF_SIMPLE_CLASS3;
+DROP TABLE COLLECTION_OF_SIMPLE_INTERFACE4;
+DROP TABLE COLLECTION_OF_SIMPLE_INTERFACE5;
+DROP TABLE COLLECTION_OF_STRING6;
+DROP TABLE COLLECTION_OF_STRING7;
+DROP TABLE COLLECTION_OF_DATE8;
+DROP TABLE COLLECTION_OF_DATE9;
+DROP TABLE COLLECTION_OF_LOCALE10;
+DROP TABLE COLLECTION_OF_LOCALE11;
+DROP TABLE COLLECTION_OF_BIG_DECIMAL12;
+DROP TABLE COLLECTION_OF_BIG_DECIMAL13;
+DROP TABLE COLLECTION_OF_BIG_INTEGER14;
+DROP TABLE COLLECTION_OF_BIG_INTEGER15;
+DROP TABLE COLLECTION_OF_BYTE16;
+DROP TABLE COLLECTION_OF_BYTE17;
+DROP TABLE COLLECTION_OF_DOUBLE18;
+DROP TABLE COLLECTION_OF_DOUBLE19;
+DROP TABLE COLLECTION_OF_FLOAT20;
+DROP TABLE COLLECTION_OF_FLOAT21;
+DROP TABLE COLLECTION_OF_INTEGER22;
+DROP TABLE COLLECTION_OF_INTEGER23;
+DROP TABLE COLLECTION_OF_LONG24;
+DROP TABLE COLLECTION_OF_LONG25;
+DROP TABLE COLLECTION_OF_SHORT26;
+DROP TABLE COLLECTION_OF_SHORT27;
+
 
 CREATE TABLE FIELDSOFBIGDECIMAL
 (
@@ -1939,239 +1942,152 @@
     CONSTRAINT FieldsOfByte_PK PRIMARY KEY (IDENTIFIER)
 );
 
-CREATE TABLE ARRAY_COLLECTIONS
-(
-    IDENTIFIER INTEGER NOT NULL,
-    CONSTRAINT AK12_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BIG_DECIMAL12
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
-    CONSTRAINT BD12_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BIG_DECIMAL13
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
-    CONSTRAINT BD13_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BIG_INTEGER14
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    CONSTRAINT BI14_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BIG_INTEGER15
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    CONSTRAINT BI15_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BYTE16
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BYTEVAL SMALLINT,
-    CONSTRAINT BY16_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_BYTE17
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    BYTEVAL SMALLINT,
-    CONSTRAINT BY17_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_DATE8
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    DATEVAL DATE,
-    CONSTRAINT BY8_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_DATE9
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    DATEVAL DATE,
-    CONSTRAINT BY9_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_DOUBLE18
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    DOUBLEVAL DOUBLE,
-    CONSTRAINT DO18_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_DOUBLE19
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    DOUBLEVAL DOUBLE,
-    CONSTRAINT DO19_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_FLOAT20
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    FLOATVAL FLOAT,
-    CONSTRAINT FL20 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_FLOAT21
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    FLOATVAL FLOAT,
-    CONSTRAINT FL21 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_INTEGER22
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    INTEGERVAL INTEGER,
-    CONSTRAINT IN22 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_INTEGER23
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    INTEGERVAL INTEGER,
-    CONSTRAINT IN23 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_LOCALE10
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    LOCALEVAL CHAR(20),
-    CONSTRAINT LOC10 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_LOCALE11
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    LOCALEVAL CHAR(20),
-    CONSTRAINT LOC11 PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_LONG24
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    LONGVAL BIGINT,
-    CONSTRAINT BI24_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_LONG25
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    LONGVAL BIGINT,
-    CONSTRAINT BI25_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_OBJECT0
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    OBJVAL BLOB,
-    CONSTRAINT OB0_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_OBJECT1
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    OBJVAL BLOB,
-    CONSTRAINT OB1_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_SHORT26
+CREATE TABLE SIMPLE_CLASS
 (
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SHORTVAL SMALLINT,
-    CONSTRAINT SM26_PK PRIMARY KEY (IDENTIFIER)
+    IDENTIFIER BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL,
+    CONSTRAINT SIMPLE_CLASS_PK PRIMARY KEY (IDENTIFIER)
+);
+
+CREATE TABLE FIELDSOFSIMPLECLASS
+(
+    IDENTIFIER INTEGER NOT NULL,
+    SIMPLECLASS0 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS1 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS2 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS3 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS4 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS5 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS6 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS7 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS10 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS11 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS12 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS13 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS14 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS16 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS17 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS18 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS19 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS20 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS21 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS22 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS23 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS29 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS30 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS31 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS32 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS33 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS36 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS37 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS38 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS39 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS40 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS41 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS42 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS43 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS46 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS47 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS48 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS49 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS50 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS52 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS53 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS54 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS55 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS56 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS57 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS58 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS59 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS65 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS66 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS67 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS68 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS69 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS72 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS73 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS74 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS75 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS76 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS77 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS78 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS79 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS82 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS83 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS84 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS85 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS86 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS88 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS89 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS90 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS91 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS92 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS93 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS94 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS95 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS101 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS102 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS103 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS104 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS105 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS108 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS109 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS110 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS111 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS112 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS113 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS114 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS115 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS118 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS119 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS120 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS121 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS122 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS124 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS125 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS126 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS127 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS128 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS129 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS130 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS131 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS137 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS138 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS139 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS140 BIGINT REFERENCES SIMPLE_CLASS,
+    SIMPLECLASS141 BIGINT REFERENCES SIMPLE_CLASS
 );
 
-CREATE TABLE ARRAY_OF_SHORT27
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SHORTVAL SMALLINT,
-    CONSTRAINT SM27_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_SIMPLE_CLASS2
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_SIMPLE_CLASS3
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE4
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE5
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI5_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_STRING6
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    CONSTRAINT ST6_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAY_OF_STRING7
-(
-    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
-    INDEX INTEGER NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    CONSTRAINT ST7_PK PRIMARY KEY (IDENTIFIER)
-);
-
-CREATE TABLE ARRAYLISTCOLLECTIONS
+CREATE TABLE ARRAY_COLLECTIONS
 (
-    IDENTIFIER INTEGER NOT NULL
+   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,
+   ARRAY_OF_BIG_INTEGER15 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_BYTE16 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_BYTE17 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_DATE8 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_DATE9 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_DOUBLE18 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_DOUBLE19 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_FLOAT20 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_FLOAT21 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_INTEGER22 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_INTEGER23 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_LOCALE10 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_LOCALE11 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_LONG24 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_LONG25 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_OBJECT0 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_OBJECT1 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_SHORT26 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_SHORT27 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_SIMPLE_INTERFACE4 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_SIMPLE_INTERFACE5 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_STRING6 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_STRING7 LONG VARCHAR FOR BIT DATA
 );
 
 --CollectionCollections
@@ -2180,203 +2096,175 @@
 CREATE TABLE COLLECTION_COLLECTIONS
 (
     IDENTIFIER INTEGER NOT NULL,
-    CONSTRAINT AK12_PK PRIMARY KEY (IDENTIFIER)
+    CONSTRAINT CC_PK PRIMARY KEY (IDENTIFIER)
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT0
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJVAL BLOB,
-    CONSTRAINT OB0_PK PRIMARY KEY (IDENTIFIER)
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_OBJECT1
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    OBJVAL BLOB,
-    CONSTRAINT OB1_PK PRIMARY KEY (IDENTIFIER)
+    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS2
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
+    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
+    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE4
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI4_PK PRIMARY KEY (IDENTIFIER)
+    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE5
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SIMPINTERFVAL BLOB,
-    CONSTRAINT SI5_PK PRIMARY KEY (IDENTIFIER)
+    SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE COLLECTION_OF_STRING6
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    CONSTRAINT ST6_PK PRIMARY KEY (IDENTIFIER)
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_STRING7
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    STRINGVAL VARCHAR(1024),
-    CONSTRAINT ST7_PK PRIMARY KEY (IDENTIFIER)
+    STRINGVAL VARCHAR(1024)
 );
 
 CREATE TABLE COLLECTION_OF_DATE8
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    CONSTRAINT BY8_PK PRIMARY KEY (IDENTIFIER)
+    DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_DATE9
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    DATEVAL DATE,
-    CONSTRAINT BY9_PK PRIMARY KEY (IDENTIFIER)
+    DATEVAL DATE
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE10
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    CONSTRAINT LOC10 PRIMARY KEY (IDENTIFIER)
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_LOCALE11
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    LOCALEVAL CHAR(20),
-    CONSTRAINT LOC11 PRIMARY KEY (IDENTIFIER)
+    LOCALEVAL CHAR(20)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL12
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
-    CONSTRAINT BD12_PK PRIMARY KEY (IDENTIFIER)
+    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_BIG_DECIMAL13
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA,
-    CONSTRAINT BD13_PK PRIMARY KEY (IDENTIFIER)
+    BIG_DECIMALVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER14
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    CONSTRAINT BI14_PK PRIMARY KEY (IDENTIFIER)
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER15
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
-    CONSTRAINT BI15_PK PRIMARY KEY (IDENTIFIER)
+    BIG_INTEGERVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE16
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    CONSTRAINT BY16_PK PRIMARY KEY (IDENTIFIER)
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_BYTE17
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    BYTEVAL SMALLINT,
-    CONSTRAINT BY17_PK PRIMARY KEY (IDENTIFIER)
+    BYTEVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE18
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    CONSTRAINT DO18_PK PRIMARY KEY (IDENTIFIER)
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_DOUBLE19
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    DOUBLEVAL DOUBLE,
-    CONSTRAINT DO19_PK PRIMARY KEY (IDENTIFIER)
+    DOUBLEVAL DOUBLE
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT20
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    CONSTRAINT FL20 PRIMARY KEY (IDENTIFIER)
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_FLOAT21
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    FLOATVAL FLOAT,
-    CONSTRAINT FL21 PRIMARY KEY (IDENTIFIER)
+    FLOATVAL FLOAT
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    CONSTRAINT IN22 PRIMARY KEY (IDENTIFIER)
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    INTEGERVAL INTEGER,
-    CONSTRAINT IN23 PRIMARY KEY (IDENTIFIER)
+    INTEGERVAL INTEGER
 );
 
 CREATE TABLE COLLECTION_OF_LONG24
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    CONSTRAINT BI24_PK PRIMARY KEY (IDENTIFIER)
+    LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_LONG25
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    LONGVAL BIGINT,
-    CONSTRAINT BI25_PK PRIMARY KEY (IDENTIFIER)
+    LONGVAL BIGINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT26
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    CONSTRAINT SM26_PK PRIMARY KEY (IDENTIFIER)
+    SHORTVAL SMALLINT
 );
 
 CREATE TABLE COLLECTION_OF_SHORT27
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
-    SHORTVAL SMALLINT,
-    CONSTRAINT SM27_PK PRIMARY KEY (IDENTIFIER)
+    SHORTVAL SMALLINT
 );
 
 -------------------------



Mime
View raw message