Author: clr
Date: Fri Jan 13 15:51:34 2006
New Revision: 368923

URL: http://svn.apache.org/viewcvs?rev=368923&view=rev
Log:
JDO-276 change column type for BigInteger from BIGINT to NUMERIC(31)

Modified:
    db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
    db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
    db/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
    db/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql

Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java?rev=368923&r1=368922&r2=368923&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java (original)
+++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java Fri Jan 13 15:51:34 2006
@@ -75,7 +75,7 @@
     {
         Transaction tx = pm.currentTransaction();
         int i, n;
-        BigInteger firstValue = new BigInteger("2007908");
+        BigInteger firstValue = new BigInteger("3958262948201938571947294821");
         BigInteger secondValue = new BigInteger("896738");
         tx.begin();
         FieldsOfBigInteger pi = new FieldsOfBigInteger();

Modified: db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java?rev=368923&r1=368922&r2=368923&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java (original)
+++ db/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java Fri Jan 13 15:51:34 2006
@@ -262,7 +262,7 @@
                     vec.add(4, new BigDecimal("456456.4353452342"));
                     break;
                   case(7):
-                    vec.add(0, new BigInteger("345345345"));
+                    vec.add(0, new BigInteger("345345345345345345345345"));
                     vec.add(1, new BigInteger("543543543543544"));
                     vec.add(2, new BigInteger("65323423432423423"));
                     vec.add(3, new BigInteger("87845634534543"));

Modified: db/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=368923&r1=368922&r2=368923&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Fri Jan 13 15:51:34 2006
@@ -1264,7 +1264,7 @@
     LOCALEVAL CHAR(20),
     DATEVAL TIMESTAMP,
     BIGDECIMALVAL DECIMAL(25,10),
-    BIGINTEGERVAL BIGINT
+    BIGINTEGERVAL NUMERIC(31)
 );
 
 ALTER TABLE ALLTYPES ADD CONSTRAINT ALLTYPES_PK PRIMARY KEY (ID);
@@ -1351,78 +1351,78 @@
 CREATE TABLE FIELDSOFBIGINTEGER
 (
     IDENTIFIER INTEGER NOT NULL,
-    BIG_INTEGER0 BIGINT,
-    BIG_INTEGER1 BIGINT,
-    BIG_INTEGER102 BIGINT,
-    BIG_INTEGER103 BIGINT,
-    BIG_INTEGER104 BIGINT,
-    BIG_INTEGER108 BIGINT,
-    BIG_INTEGER109 BIGINT,
-    BIG_INTEGER11 BIGINT,
-    BIG_INTEGER110 BIGINT,
-    BIG_INTEGER112 BIGINT,
-    BIG_INTEGER113 BIGINT,
-    BIG_INTEGER114 BIGINT,
-    BIG_INTEGER119 BIGINT,
-    BIG_INTEGER12 BIGINT,
-    BIG_INTEGER120 BIGINT,
-    BIG_INTEGER121 BIGINT,
-    BIG_INTEGER124 BIGINT,
-    BIG_INTEGER125 BIGINT,
-    BIG_INTEGER126 BIGINT,
-    BIG_INTEGER128 BIGINT,
-    BIG_INTEGER129 BIGINT,
-    BIG_INTEGER13 BIGINT,
-    BIG_INTEGER130 BIGINT,
-    BIG_INTEGER138 BIGINT,
-    BIG_INTEGER139 BIGINT,
-    BIG_INTEGER140 BIGINT,
-    BIG_INTEGER16 BIGINT,
-    BIG_INTEGER17 BIGINT,
-    BIG_INTEGER18 BIGINT,
-    BIG_INTEGER2 BIGINT,
-    BIG_INTEGER20 BIGINT,
-    BIG_INTEGER21 BIGINT,
-    BIG_INTEGER22 BIGINT,
-    BIG_INTEGER30 BIGINT,
-    BIG_INTEGER31 BIGINT,
-    BIG_INTEGER32 BIGINT,
-    BIG_INTEGER36 BIGINT,
-    BIG_INTEGER37 BIGINT,
-    BIG_INTEGER38 BIGINT,
-    BIG_INTEGER4 BIGINT,
-    BIG_INTEGER40 BIGINT,
-    BIG_INTEGER41 BIGINT,
-    BIG_INTEGER42 BIGINT,
-    BIG_INTEGER47 BIGINT,
-    BIG_INTEGER48 BIGINT,
-    BIG_INTEGER49 BIGINT,
-    BIG_INTEGER5 BIGINT,
-    BIG_INTEGER52 BIGINT,
-    BIG_INTEGER53 BIGINT,
-    BIG_INTEGER54 BIGINT,
-    BIG_INTEGER56 BIGINT,
-    BIG_INTEGER57 BIGINT,
-    BIG_INTEGER58 BIGINT,
-    BIG_INTEGER6 BIGINT,
-    BIG_INTEGER66 BIGINT,
-    BIG_INTEGER67 BIGINT,
-    BIG_INTEGER68 BIGINT,
-    BIG_INTEGER72 BIGINT,
-    BIG_INTEGER73 BIGINT,
-    BIG_INTEGER74 BIGINT,
-    BIG_INTEGER76 BIGINT,
-    BIG_INTEGER77 BIGINT,
-    BIG_INTEGER78 BIGINT,
-    BIG_INTEGER83 BIGINT,
-    BIG_INTEGER84 BIGINT,
-    BIG_INTEGER85 BIGINT,
-    BIG_INTEGER88 BIGINT,
-    BIG_INTEGER89 BIGINT,
-    BIG_INTEGER90 BIGINT,
-    BIG_INTEGER92 BIGINT,
-    BIG_INTEGER93 BIGINT,
-    BIG_INTEGER94 BIGINT
+    BIG_INTEGER0 NUMERIC(31),
+    BIG_INTEGER1 NUMERIC(31),
+    BIG_INTEGER102 NUMERIC(31),
+    BIG_INTEGER103 NUMERIC(31),
+    BIG_INTEGER104 NUMERIC(31),
+    BIG_INTEGER108 NUMERIC(31),
+    BIG_INTEGER109 NUMERIC(31),
+    BIG_INTEGER11 NUMERIC(31),
+    BIG_INTEGER110 NUMERIC(31),
+    BIG_INTEGER112 NUMERIC(31),
+    BIG_INTEGER113 NUMERIC(31),
+    BIG_INTEGER114 NUMERIC(31),
+    BIG_INTEGER119 NUMERIC(31),
+    BIG_INTEGER12 NUMERIC(31),
+    BIG_INTEGER120 NUMERIC(31),
+    BIG_INTEGER121 NUMERIC(31),
+    BIG_INTEGER124 NUMERIC(31),
+    BIG_INTEGER125 NUMERIC(31),
+    BIG_INTEGER126 NUMERIC(31),
+    BIG_INTEGER128 NUMERIC(31),
+    BIG_INTEGER129 NUMERIC(31),
+    BIG_INTEGER13 NUMERIC(31),
+    BIG_INTEGER130 NUMERIC(31),
+    BIG_INTEGER138 NUMERIC(31),
+    BIG_INTEGER139 NUMERIC(31),
+    BIG_INTEGER140 NUMERIC(31),
+    BIG_INTEGER16 NUMERIC(31),
+    BIG_INTEGER17 NUMERIC(31),
+    BIG_INTEGER18 NUMERIC(31),
+    BIG_INTEGER2 NUMERIC(31),
+    BIG_INTEGER20 NUMERIC(31),
+    BIG_INTEGER21 NUMERIC(31),
+    BIG_INTEGER22 NUMERIC(31),
+    BIG_INTEGER30 NUMERIC(31),
+    BIG_INTEGER31 NUMERIC(31),
+    BIG_INTEGER32 NUMERIC(31),
+    BIG_INTEGER36 NUMERIC(31),
+    BIG_INTEGER37 NUMERIC(31),
+    BIG_INTEGER38 NUMERIC(31),
+    BIG_INTEGER4 NUMERIC(31),
+    BIG_INTEGER40 NUMERIC(31),
+    BIG_INTEGER41 NUMERIC(31),
+    BIG_INTEGER42 NUMERIC(31),
+    BIG_INTEGER47 NUMERIC(31),
+    BIG_INTEGER48 NUMERIC(31),
+    BIG_INTEGER49 NUMERIC(31),
+    BIG_INTEGER5 NUMERIC(31),
+    BIG_INTEGER52 NUMERIC(31),
+    BIG_INTEGER53 NUMERIC(31),
+    BIG_INTEGER54 NUMERIC(31),
+    BIG_INTEGER56 NUMERIC(31),
+    BIG_INTEGER57 NUMERIC(31),
+    BIG_INTEGER58 NUMERIC(31),
+    BIG_INTEGER6 NUMERIC(31),
+    BIG_INTEGER66 NUMERIC(31),
+    BIG_INTEGER67 NUMERIC(31),
+    BIG_INTEGER68 NUMERIC(31),
+    BIG_INTEGER72 NUMERIC(31),
+    BIG_INTEGER73 NUMERIC(31),
+    BIG_INTEGER74 NUMERIC(31),
+    BIG_INTEGER76 NUMERIC(31),
+    BIG_INTEGER77 NUMERIC(31),
+    BIG_INTEGER78 NUMERIC(31),
+    BIG_INTEGER83 NUMERIC(31),
+    BIG_INTEGER84 NUMERIC(31),
+    BIG_INTEGER85 NUMERIC(31),
+    BIG_INTEGER88 NUMERIC(31),
+    BIG_INTEGER89 NUMERIC(31),
+    BIG_INTEGER90 NUMERIC(31),
+    BIG_INTEGER92 NUMERIC(31),
+    BIG_INTEGER93 NUMERIC(31),
+    BIG_INTEGER94 NUMERIC(31)
 );
 
 ALTER TABLE FIELDSOFBIGINTEGER ADD CONSTRAINT FIELDSOFBIGI2S_PK PRIMARY KEY (IDENTIFIER);
@@ -3263,7 +3263,7 @@
 (
     IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
     ORDER_COL BIGINT,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE ARRAY_OF_BYTE17
@@ -3457,14 +3457,14 @@
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE COLLECTION_OF_BYTE24
@@ -3700,14 +3700,14 @@
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LIST_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LIST_OF_BYTE24
@@ -3935,14 +3935,14 @@
 CREATE TABLE ARRAYLIST_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
@@ -4179,14 +4179,14 @@
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LINKEDLIST_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LINKEDLIST_OF_BYTE24
@@ -4422,14 +4422,14 @@
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE VECTOR_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE VECTOR_OF_BYTE24
@@ -4632,13 +4632,13 @@
 CREATE TABLE SET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE SET_OF_BYTE24
@@ -4829,13 +4829,13 @@
 CREATE TABLE HASHSET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHSET_OF_BYTE24
@@ -5036,14 +5036,14 @@
 CREATE TABLE TREESET_OF_BIG_INTEGER18
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_BIG_INTEGER20
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
@@ -5304,21 +5304,21 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE24
@@ -5561,14 +5561,14 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE66
@@ -5708,7 +5708,7 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE108
@@ -5926,21 +5926,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE24
@@ -6183,14 +6183,14 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE66
@@ -6330,7 +6330,7 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE108
@@ -6548,21 +6548,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE24
@@ -6805,14 +6805,14 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE66
@@ -6952,7 +6952,7 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE108
@@ -7254,37 +7254,37 @@
 CREATE TABLE HASHMAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BYTE63_STR (
@@ -7760,37 +7760,37 @@
 CREATE TABLE HASHTBL_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BYTE63_STR (
@@ -8266,37 +8266,37 @@
 CREATE TABLE TREEMAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BYTE63_STR (
@@ -8772,37 +8772,37 @@
 CREATE TABLE MAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BYTE63_STR (
@@ -9194,21 +9194,21 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE24
@@ -9451,14 +9451,14 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE66
@@ -9598,7 +9598,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE108

Modified: db/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/db/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=368923&r1=368922&r2=368923&view=diff
==============================================================================
--- db/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ db/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Fri Jan 13 15:51:34 2006
@@ -1227,7 +1227,7 @@
     LOCALEVAL CHAR(20),
     DATEVAL TIMESTAMP,
     BIGDECIMALVAL DECIMAL(25,10),
-    BIGINTEGERVAL BIGINT
+    BIGINTEGERVAL NUMERIC(31)
 );
 
 ALTER TABLE ALLTYPES ADD CONSTRAINT ALLTYPES_PK PRIMARY KEY (DATASTORE_IDENTITY);
@@ -1316,78 +1316,78 @@
 (
     DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     IDENTIFIER INTEGER,
-    BIG_INTEGER0 BIGINT,
-    BIG_INTEGER1 BIGINT,
-    BIG_INTEGER102 BIGINT,
-    BIG_INTEGER103 BIGINT,
-    BIG_INTEGER104 BIGINT,
-    BIG_INTEGER108 BIGINT,
-    BIG_INTEGER109 BIGINT,
-    BIG_INTEGER11 BIGINT,
-    BIG_INTEGER110 BIGINT,
-    BIG_INTEGER112 BIGINT,
-    BIG_INTEGER113 BIGINT,
-    BIG_INTEGER114 BIGINT,
-    BIG_INTEGER119 BIGINT,
-    BIG_INTEGER12 BIGINT,
-    BIG_INTEGER120 BIGINT,
-    BIG_INTEGER121 BIGINT,
-    BIG_INTEGER124 BIGINT,
-    BIG_INTEGER125 BIGINT,
-    BIG_INTEGER126 BIGINT,
-    BIG_INTEGER128 BIGINT,
-    BIG_INTEGER129 BIGINT,
-    BIG_INTEGER13 BIGINT,
-    BIG_INTEGER130 BIGINT,
-    BIG_INTEGER138 BIGINT,
-    BIG_INTEGER139 BIGINT,
-    BIG_INTEGER140 BIGINT,
-    BIG_INTEGER16 BIGINT,
-    BIG_INTEGER17 BIGINT,
-    BIG_INTEGER18 BIGINT,
-    BIG_INTEGER2 BIGINT,
-    BIG_INTEGER20 BIGINT,
-    BIG_INTEGER21 BIGINT,
-    BIG_INTEGER22 BIGINT,
-    BIG_INTEGER30 BIGINT,
-    BIG_INTEGER31 BIGINT,
-    BIG_INTEGER32 BIGINT,
-    BIG_INTEGER36 BIGINT,
-    BIG_INTEGER37 BIGINT,
-    BIG_INTEGER38 BIGINT,
-    BIG_INTEGER4 BIGINT,
-    BIG_INTEGER40 BIGINT,
-    BIG_INTEGER41 BIGINT,
-    BIG_INTEGER42 BIGINT,
-    BIG_INTEGER47 BIGINT,
-    BIG_INTEGER48 BIGINT,
-    BIG_INTEGER49 BIGINT,
-    BIG_INTEGER5 BIGINT,
-    BIG_INTEGER52 BIGINT,
-    BIG_INTEGER53 BIGINT,
-    BIG_INTEGER54 BIGINT,
-    BIG_INTEGER56 BIGINT,
-    BIG_INTEGER57 BIGINT,
-    BIG_INTEGER58 BIGINT,
-    BIG_INTEGER6 BIGINT,
-    BIG_INTEGER66 BIGINT,
-    BIG_INTEGER67 BIGINT,
-    BIG_INTEGER68 BIGINT,
-    BIG_INTEGER72 BIGINT,
-    BIG_INTEGER73 BIGINT,
-    BIG_INTEGER74 BIGINT,
-    BIG_INTEGER76 BIGINT,
-    BIG_INTEGER77 BIGINT,
-    BIG_INTEGER78 BIGINT,
-    BIG_INTEGER83 BIGINT,
-    BIG_INTEGER84 BIGINT,
-    BIG_INTEGER85 BIGINT,
-    BIG_INTEGER88 BIGINT,
-    BIG_INTEGER89 BIGINT,
-    BIG_INTEGER90 BIGINT,
-    BIG_INTEGER92 BIGINT,
-    BIG_INTEGER93 BIGINT,
-    BIG_INTEGER94 BIGINT
+    BIG_INTEGER0 NUMERIC(31),
+    BIG_INTEGER1 NUMERIC(31),
+    BIG_INTEGER102 NUMERIC(31),
+    BIG_INTEGER103 NUMERIC(31),
+    BIG_INTEGER104 NUMERIC(31),
+    BIG_INTEGER108 NUMERIC(31),
+    BIG_INTEGER109 NUMERIC(31),
+    BIG_INTEGER11 NUMERIC(31),
+    BIG_INTEGER110 NUMERIC(31),
+    BIG_INTEGER112 NUMERIC(31),
+    BIG_INTEGER113 NUMERIC(31),
+    BIG_INTEGER114 NUMERIC(31),
+    BIG_INTEGER119 NUMERIC(31),
+    BIG_INTEGER12 NUMERIC(31),
+    BIG_INTEGER120 NUMERIC(31),
+    BIG_INTEGER121 NUMERIC(31),
+    BIG_INTEGER124 NUMERIC(31),
+    BIG_INTEGER125 NUMERIC(31),
+    BIG_INTEGER126 NUMERIC(31),
+    BIG_INTEGER128 NUMERIC(31),
+    BIG_INTEGER129 NUMERIC(31),
+    BIG_INTEGER13 NUMERIC(31),
+    BIG_INTEGER130 NUMERIC(31),
+    BIG_INTEGER138 NUMERIC(31),
+    BIG_INTEGER139 NUMERIC(31),
+    BIG_INTEGER140 NUMERIC(31),
+    BIG_INTEGER16 NUMERIC(31),
+    BIG_INTEGER17 NUMERIC(31),
+    BIG_INTEGER18 NUMERIC(31),
+    BIG_INTEGER2 NUMERIC(31),
+    BIG_INTEGER20 NUMERIC(31),
+    BIG_INTEGER21 NUMERIC(31),
+    BIG_INTEGER22 NUMERIC(31),
+    BIG_INTEGER30 NUMERIC(31),
+    BIG_INTEGER31 NUMERIC(31),
+    BIG_INTEGER32 NUMERIC(31),
+    BIG_INTEGER36 NUMERIC(31),
+    BIG_INTEGER37 NUMERIC(31),
+    BIG_INTEGER38 NUMERIC(31),
+    BIG_INTEGER4 NUMERIC(31),
+    BIG_INTEGER40 NUMERIC(31),
+    BIG_INTEGER41 NUMERIC(31),
+    BIG_INTEGER42 NUMERIC(31),
+    BIG_INTEGER47 NUMERIC(31),
+    BIG_INTEGER48 NUMERIC(31),
+    BIG_INTEGER49 NUMERIC(31),
+    BIG_INTEGER5 NUMERIC(31),
+    BIG_INTEGER52 NUMERIC(31),
+    BIG_INTEGER53 NUMERIC(31),
+    BIG_INTEGER54 NUMERIC(31),
+    BIG_INTEGER56 NUMERIC(31),
+    BIG_INTEGER57 NUMERIC(31),
+    BIG_INTEGER58 NUMERIC(31),
+    BIG_INTEGER6 NUMERIC(31),
+    BIG_INTEGER66 NUMERIC(31),
+    BIG_INTEGER67 NUMERIC(31),
+    BIG_INTEGER68 NUMERIC(31),
+    BIG_INTEGER72 NUMERIC(31),
+    BIG_INTEGER73 NUMERIC(31),
+    BIG_INTEGER74 NUMERIC(31),
+    BIG_INTEGER76 NUMERIC(31),
+    BIG_INTEGER77 NUMERIC(31),
+    BIG_INTEGER78 NUMERIC(31),
+    BIG_INTEGER83 NUMERIC(31),
+    BIG_INTEGER84 NUMERIC(31),
+    BIG_INTEGER85 NUMERIC(31),
+    BIG_INTEGER88 NUMERIC(31),
+    BIG_INTEGER89 NUMERIC(31),
+    BIG_INTEGER90 NUMERIC(31),
+    BIG_INTEGER92 NUMERIC(31),
+    BIG_INTEGER93 NUMERIC(31),
+    BIG_INTEGER94 NUMERIC(31)
 );
 
 ALTER TABLE FIELDSOFBIGINTEGER ADD CONSTRAINT FIELDSOFBIGI2S_PK PRIMARY KEY (DATASTORE_IDENTITY);
@@ -3250,7 +3250,7 @@
 (
     IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
     ORDER_COL BIGINT,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE ARRAY_OF_BYTE17
@@ -3445,14 +3445,14 @@
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE COLLECTION_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE COLLECTION_OF_BYTE24
@@ -3689,14 +3689,14 @@
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LIST_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES LIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LIST_OF_BYTE24
@@ -3925,14 +3925,14 @@
 CREATE TABLE ARRAYLIST_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE ARRAYLIST_OF_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
@@ -4170,14 +4170,14 @@
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LINKEDLIST_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES LINKEDLIST_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE LINKEDLIST_OF_BYTE24
@@ -4414,14 +4414,14 @@
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE VECTOR_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES VECTOR_COLLECTIONS NOT NULL,
     ALLOW_DUPLICATES BIGINT NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE VECTOR_OF_BYTE24
@@ -4625,13 +4625,13 @@
 CREATE TABLE SET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE SET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE SET_OF_BYTE24
@@ -4823,13 +4823,13 @@
 CREATE TABLE HASHSET_OF_BIG_INTEGER21
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHSET_OF_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT
+    BIG_INTEGERVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHSET_OF_BYTE24
@@ -5031,14 +5031,14 @@
 CREATE TABLE TREESET_OF_BIG_INTEGER18
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
 CREATE TABLE TREESET_OF_BIG_INTEGER20
 (
     IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
-    BIG_INTEGERVAL BIGINT,
+    BIG_INTEGERVAL NUMERIC(31),
     INDEX INTEGER NOT NULL
 );
 
@@ -5300,21 +5300,21 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE24
@@ -5557,14 +5557,14 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE66
@@ -5704,7 +5704,7 @@
 (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE MAP_OF_STRING_BYTE108
@@ -5923,21 +5923,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE24
@@ -6180,14 +6180,14 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE66
@@ -6327,7 +6327,7 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHMAP_STR_BYTE108
@@ -6546,21 +6546,21 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE24
@@ -6803,14 +6803,14 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE66
@@ -6950,7 +6950,7 @@
 (
     IDENTIFIER INTEGER REFERENCES HASHTABLESTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE HASHTBL_STR_BYTE108
@@ -7254,37 +7254,37 @@
 CREATE TABLE HASHMAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHMAP_BYTE63_STR (
@@ -7761,37 +7761,37 @@
 CREATE TABLE HASHTBL_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE HASHTBL_BYTE63_STR (
@@ -8268,37 +8268,37 @@
 CREATE TABLE TREEMAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE TREEMAP_BYTE63_STR (
@@ -8775,37 +8775,37 @@
 CREATE TABLE MAP_BIG_INTEGER54_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER55_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER56_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER57_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER58_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BIG_INTEGER60_STR (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
-    KEYVAL BIGINT
+    KEYVAL NUMERIC(31)
 );
 
 CREATE TABLE MAP_BYTE63_STR (
@@ -9198,21 +9198,21 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER22
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER23
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE24
@@ -9455,14 +9455,14 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BIG_INTEGER64
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE66
@@ -9602,7 +9602,7 @@
 (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT NULL,
     KEYVAL VARCHAR(100) NOT NULL,
-    VALUEVAL BIGINT NOT NULL
+    VALUEVAL NUMERIC(31) NOT NULL
 );
 
 CREATE TABLE TREEMAP_STR_BYTE108