db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r332314 - in /incubator/jdo/trunk/tck20/test: orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ sql/derby/applicationidentity/ sql/derby/datastoreidentity/
Date Thu, 10 Nov 2005 15:59:24 GMT
Author: mcaisse
Date: Thu Nov 10 07:59:20 2005
New Revision: 332314

URL: http://svn.apache.org/viewcvs?rev=332314&view=rev
Log:
JDO-207

Modified:
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -460,13 +460,7 @@
             <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
                <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Object86"
                    column="HASHMAP_STR_OBJECT86">
@@ -475,13 +469,7 @@
                    table="HASHMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_SimpleClass89"
                    column="HASHMAP_STR_SIMPLECLASS89">
@@ -490,13 +478,7 @@
                    table="HASHMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_SimpleInterface92"
                    column="HASHMAP_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -462,13 +462,7 @@
                    table="HASHTBL_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_Object86"
                    column="HASHTBL_STR_OBJECT86">
@@ -477,13 +471,7 @@
                    table="HASHTBL_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_SimpleClass89"
                    column="HASHTBL_STR_SIMPLECLASS89">
@@ -492,13 +480,7 @@
                    table="HASHTBL_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_SimpleInterface92"
                    column="HASHTBL_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -459,13 +459,7 @@
             <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_Object86"
                    column="MAP_OF_STRING_OBJECT86">
@@ -474,13 +468,7 @@
                    table="MAP_OF_STRING_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_SimpleClass89"
                    column="MAP_OF_STRING_SIMPLECLASS89">
@@ -489,13 +477,7 @@
                    table="MAP_OF_STRING_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_SimpleInterface92"
                    column="MAP_OF_STRING_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -460,13 +460,7 @@
             <field name="TreeMapOfString_Object84" table="TREEMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_Object86"
                    column="TREEMAP_STR_OBJECT86">
@@ -475,13 +469,7 @@
                    table="TREEMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_SimpleClass89"
                    column="TREEMAP_STR_SIMPLECLASS89">
@@ -490,13 +478,7 @@
                    table="TREEMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface92"
                    column="TREEMAP_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -2,8 +2,10 @@
 <!DOCTYPE orm PUBLIC "-//Sun Microsystems, Inc.//DTD Java Data Objects Mapping Metadata
2.0//EN" "http://java.sun.com/dtd/orm_2_0.dtd">
 <orm>
     <package name="org.apache.jdo.tck.pc.fieldtypes">
-        <class name="HashMapStringKeyCollections" table="HASHMAPSTRINGKEY_COLLECTIONS">
-            <datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
+        <class name="HashMapStringKeyCollections"
+               table="HASHMAPSTRINGKEY_COLLECTIONS">
+            <datastore-identity strategy="identity"
+                                column="DATASTORE_IDENTITY"/>
             <field name="identifier" column="IDENTIFIER"/>
             <field name="HashMapOfString_Object0" table="HASHMAP_STR_OBJECT0">
                 <join column="IDENTIFIER"/>
@@ -460,13 +462,7 @@
             <field name="HashMapOfString_Object84" table="HASHMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_Object86"
                    column="HASHMAP_STR_OBJECT86">
@@ -475,13 +471,7 @@
                    table="HASHMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_SimpleClass89"
                    column="HASHMAP_STR_SIMPLECLASS89">
@@ -490,13 +480,7 @@
                    table="HASHMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashMapOfString_SimpleInterface92"
                    column="HASHMAP_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -464,13 +464,7 @@
                    table="HASHTBL_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_Object86"
                    column="HASHTBL_STR_OBJECT86">
@@ -479,13 +473,7 @@
                    table="HASHTBL_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_SimpleClass89"
                    column="HASHTBL_STR_SIMPLECLASS89">
@@ -494,13 +482,7 @@
                    table="HASHTBL_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="HashtableOfString_SimpleInterface92"
                    column="HASHTBL_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -461,13 +461,7 @@
             <field name="MapOfString_Object84" table="MAP_OF_STRING_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_Object86"
                    column="MAP_OF_STRING_OBJECT86">
@@ -476,13 +470,7 @@
                    table="MAP_OF_STRING_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_SimpleClass89"
                    column="MAP_OF_STRING_SIMPLECLASS89">
@@ -491,13 +479,7 @@
                    table="MAP_OF_STRING_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="MapOfString_SimpleInterface92"
                    column="MAP_OF_STRING_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
(original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringKeyCollections-derby.orm
Thu Nov 10 07:59:20 2005
@@ -462,13 +462,7 @@
             <field name="TreeMapOfString_Object84" table="TREEMAP_STR_OBJECT84">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_Object86"
                    column="TREEMAP_STR_OBJECT86">
@@ -477,13 +471,7 @@
                    table="TREEMAP_STR_SIMPLE_CLASS87">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_SimpleClass89"
                    column="TREEMAP_STR_SIMPLECLASS89">
@@ -492,13 +480,7 @@
                    table="TREEMAP_STR_SIMPLE_INTERFACE90">
                 <join column="IDENTIFIER"/>
                 <key column="KEYVAL"/>
-                <value>
-                    <embedded>
-                        <field name="id" column="ID"/>
-                        <field name="intField" column="INTVAL"/>
-                        <field name="stringField" column="STRINGVAL"/>
-                    </embedded>
-                </value>
+                <value column="VALUEVAL"/>
             </field>
             <field name="TreeMapOfString_SimpleInterface92"
                    column="TREEMAP_STR_SIMPLEINTERFACE92">

Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Thu Nov 10 07:59:20
2005
@@ -609,11 +609,8 @@
 DROP TABLE MAP_OF_STRING_SHORT81;
 DROP TABLE MAP_OF_STRING_SHORT82;
 DROP TABLE MAP_OF_STRING_OBJECT84;
-DROP TABLE MAP_OF_STRING_OBJECT86;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS87;
-DROP TABLE MAP_OF_STRING_SIMPLE_CLASS89;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE90;
-DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE92;
 DROP TABLE MAP_OF_STRING_STRING93;
 DROP TABLE MAP_OF_STRING_DATE96;
 DROP TABLE MAP_OF_STRING_LOCALE99;
@@ -698,11 +695,8 @@
 DROP TABLE HASHMAP_STR_SHORT81;
 DROP TABLE HASHMAP_STR_SHORT82;
 DROP TABLE HASHMAP_STR_OBJECT84;
-DROP TABLE HASHMAP_STR_OBJECT86;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS87;
-DROP TABLE HASHMAP_STR_SIMPLE_CLASS89;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHMAP_STR_STRING93;
 DROP TABLE HASHMAP_STR_DATE96;
 DROP TABLE HASHMAP_STR_LOCALE99;
@@ -867,11 +861,8 @@
 DROP TABLE HASHTBL_STR_SHORT81;
 DROP TABLE HASHTBL_STR_SHORT82;
 DROP TABLE HASHTBL_STR_OBJECT84;
-DROP TABLE HASHTBL_STR_OBJECT86;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS87;
-DROP TABLE HASHTBL_STR_SIMPLE_CLASS89;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHTBL_STR_STRING93;
 DROP TABLE HASHTBL_STR_DATE96;
 DROP TABLE HASHTBL_STR_LOCALE99;
@@ -956,11 +947,8 @@
 DROP TABLE TREEMAP_STR_SHORT81;
 DROP TABLE TREEMAP_STR_SHORT82;
 DROP TABLE TREEMAP_STR_OBJECT84;
-DROP TABLE TREEMAP_STR_OBJECT86;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS87;
-DROP TABLE TREEMAP_STR_SIMPLE_CLASS89;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE TREEMAP_STR_STRING93;
 DROP TABLE TREEMAP_STR_DATE96;
 DROP TABLE TREEMAP_STR_LOCALE99;
@@ -5760,48 +5748,20 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF LONG VARCHAR FOR BIT DATA NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE MAP_OF_STRING_STRING93
@@ -6409,48 +6369,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_STRING93
@@ -7058,48 +6991,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_STRING93
@@ -9731,48 +9637,21 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_STRING93

Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=332314&r1=332313&r2=332314&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Thu Nov 10 07:59:20
2005
@@ -569,11 +569,8 @@
 DROP TABLE MAP_OF_STRING_SHORT81;
 DROP TABLE MAP_OF_STRING_SHORT82;
 DROP TABLE MAP_OF_STRING_OBJECT84;
-DROP TABLE MAP_OF_STRING_OBJECT86;
 DROP TABLE MAP_OF_STRING_SIMPLE_CLASS87;
-DROP TABLE MAP_OF_STRING_SIMPLE_CLASS89;
 DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE90;
-DROP TABLE MAP_OF_STRING_SIMPLE_INTERFACE92;
 DROP TABLE MAP_OF_STRING_STRING93;
 DROP TABLE MAP_OF_STRING_DATE96;
 DROP TABLE MAP_OF_STRING_LOCALE99;
@@ -658,11 +655,8 @@
 DROP TABLE HASHMAP_STR_SHORT81;
 DROP TABLE HASHMAP_STR_SHORT82;
 DROP TABLE HASHMAP_STR_OBJECT84;
-DROP TABLE HASHMAP_STR_OBJECT86;
 DROP TABLE HASHMAP_STR_SIMPLE_CLASS87;
-DROP TABLE HASHMAP_STR_SIMPLE_CLASS89;
 DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHMAP_STR_STRING93;
 DROP TABLE HASHMAP_STR_DATE96;
 DROP TABLE HASHMAP_STR_LOCALE99;
@@ -827,11 +821,8 @@
 DROP TABLE HASHTBL_STR_SHORT81;
 DROP TABLE HASHTBL_STR_SHORT82;
 DROP TABLE HASHTBL_STR_OBJECT84;
-DROP TABLE HASHTBL_STR_OBJECT86;
 DROP TABLE HASHTBL_STR_SIMPLE_CLASS87;
-DROP TABLE HASHTBL_STR_SIMPLE_CLASS89;
 DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE90;
-DROP TABLE HASHTBL_STR_SIMPLE_INTERFACE92;
 DROP TABLE HASHTBL_STR_STRING93;
 DROP TABLE HASHTBL_STR_DATE96;
 DROP TABLE HASHTBL_STR_LOCALE99;
@@ -916,11 +907,8 @@
 DROP TABLE TREEMAP_STR_SHORT81;
 DROP TABLE TREEMAP_STR_SHORT82;
 DROP TABLE TREEMAP_STR_OBJECT84;
-DROP TABLE TREEMAP_STR_OBJECT86;
 DROP TABLE TREEMAP_STR_SIMPLE_CLASS87;
-DROP TABLE TREEMAP_STR_SIMPLE_CLASS89;
 DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE90;
-DROP TABLE TREEMAP_STR_SIMPLE_INTERFACE92;
 DROP TABLE TREEMAP_STR_STRING93;
 DROP TABLE TREEMAP_STR_DATE96;
 DROP TABLE TREEMAP_STR_LOCALE99;
@@ -5755,48 +5743,21 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE MAP_OF_STRING_STRING93
@@ -6405,48 +6366,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHMAP_STR_STRING93
@@ -7055,48 +6989,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE HASHTBL_STR_STRING93
@@ -9734,48 +9641,21 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_OBJECT86
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS87
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_SIMPLE_CLASS89
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    ID BIGINT NOT NULL,
-    INTVAL INTEGER NOT NULL,
-    STRINGVAL VARCHAR(128) NOT NULL
-);
-
-CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE92
-(
-    IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
-    KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+	VALUEVAL LONG VARCHAR FOR BIT DATA
 );
 
 CREATE TABLE TREEMAP_STR_STRING93



Mime
View raw message