Return-Path: 
 <jdo-commits-return-1047-apmail-db-jdo-commits-archive=www.apache.org@db.apache.org>
Delivered-To: apmail-db-jdo-commits-archive@www.apache.org
Received: (qmail 1480 invoked from network); 19 Oct 2005 23:06:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 19 Oct 2005 23:06:12 -0000
Received: (qmail 49943 invoked by uid 500); 19 Oct 2005 23:06:11 -0000
Mailing-List: contact jdo-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jdo-commits-help@db.apache.org>
List-Unsubscribe: <mailto:jdo-commits-unsubscribe@db.apache.org>
List-Post: <mailto:jdo-commits@db.apache.org>
List-Id: <jdo-commits.db.apache.org>
Reply-To: jdo-dev@db.apache.org
Delivered-To: mailing list jdo-commits@db.apache.org
Received: (qmail 49930 invoked by uid 99); 19 Oct 2005 23:06:11 -0000
X-ASF-Spam-Status: No, hits=-8.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME,UPPERCASE_75_100
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Oct 2005 16:06:10 -0700
Received: (qmail 1272 invoked by uid 65534); 19 Oct 2005 23:05:50 -0000
Message-ID: <20051019230550.1271.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r326742 - in /incubator/jdo/trunk/tck20/test/sql/derby:
 applicationidentity/schema.sql datastoreidentity/schema.sql
Date: Wed, 19 Oct 2005 23:05:49 -0000
To: jdo-commits@db.apache.org
From: mcaisse@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: mcaisse
Date: Wed Oct 19 16:05:46 2005
New Revision: 326742

URL: http://svn.apache.org/viewcvs?rev=326742&view=rev
Log:
Fix tables for embedded values of String key Map Collections

Modified:
    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/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=326742&r1=326741&r2=326742&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Wed Oct 19 16:05:46 2005
@@ -5353,42 +5353,54 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_STRING51
@@ -5549,7 +5561,9 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT86
@@ -5563,21 +5577,25 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS 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
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE90
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    SIMPINTREF LONG VARCHAR FOR BIT DATA NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
@@ -5984,42 +6002,54 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_STRING51
@@ -6180,7 +6210,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT86
@@ -6194,7 +6226,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
@@ -6208,7 +6242,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
@@ -6615,42 +6651,54 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+     ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_STRING51
@@ -6811,7 +6859,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT86
@@ -6825,7 +6875,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS89
@@ -6839,7 +6891,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE92
@@ -8387,42 +8441,54 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_STRING51
@@ -8583,7 +8649,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_OBJECT86
@@ -8597,7 +8665,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS89
@@ -8611,7 +8681,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE92

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=326742&r1=326741&r2=326742&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Wed Oct 19 16:05:46 2005
@@ -5346,42 +5346,54 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_STRING51
@@ -5542,7 +5554,9 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_OBJECT86
@@ -5556,7 +5570,9 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_CLASS89
@@ -5570,7 +5586,9 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_SIMPLE_INTERFACE92
@@ -5978,42 +5996,54 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_STRING51
@@ -6174,7 +6204,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_OBJECT86
@@ -6188,7 +6220,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_CLASS89
@@ -6202,7 +6236,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_SIMPLE_INTERFACE92
@@ -6610,42 +6646,54 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_STRING51
@@ -6806,7 +6854,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_OBJECT86
@@ -6820,7 +6870,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_CLASS89
@@ -6834,7 +6886,9 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_SIMPLE_INTERFACE92
@@ -8387,42 +8441,54 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_OBJECT43
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS45
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS46
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE48
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE49
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_STRING51
@@ -8583,7 +8649,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_OBJECT86
@@ -8597,7 +8665,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_CLASS89
@@ -8611,7 +8681,9 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+    ID BIGINT NOT NULL,
+    INTVAL INTEGER NOT NULL,
+    STRINGVAL VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_SIMPLE_INTERFACE92