You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/05/16 23:59:14 UTC

svn commit: r170474 - /incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle /incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle /incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes /incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes /incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes /incubator/jdo/trunk/tck20/test/sql/derby

Author: mcaisse
Date: Mon May 16 14:59:14 2005
New Revision: 170474

URL: http://svn.apache.org/viewcvs?rev=170474&view=rev
Log:
JDO-44, JDO-42, JDO-8 (patch)

Modified:
    incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
    incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
    incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql

Modified: incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java (original)
+++ incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java Mon May 16 14:59:14 2005
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.mylib.PCRect;
+import org.apache.jdo.tck.pc.mylib.PCPoint;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
@@ -77,7 +78,7 @@
 
     /** */
     private PCRect getPersistentNewInstance() {
-        PCRect obj = new PCRect();
+        PCRect obj = new PCRect(0, new PCPoint(1,5), new PCPoint(7,3));
         pm.makePersistent(obj); // obj should transition to persistent-new
         int curr = currentState(obj);
         if( curr != PERSISTENT_NEW ){

Modified: incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java (original)
+++ incubator/jdo/trunk/tck11/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java Mon May 16 14:59:14 2005
@@ -125,9 +125,9 @@
         for( i = 0, value = startValue; i < n; ++i){
             if( !FieldsOfBigDecimal.isPersistent[i] ) continue;
             BigDecimal val = pi.get(i);
-            if(!val.equals(value)){
+            if(val.compareTo(value) != 0){
                 fail(ASSERTION_FAILED,
-                     "Incorrect value for " + FieldsOfBigDecimal.fieldSpecs[i] + 
+                     "Incorrect value for " + FieldsOfBigDecimal.fieldSpecs[i] +
                      ", expected value " + value.toString() + 
                      ", value is " + val.toString());
             }

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/lifecycle/HollowInstanceMaintainsPK.java Mon May 16 14:59:14 2005
@@ -25,6 +25,7 @@
 
 import org.apache.jdo.tck.JDO_Test;
 import org.apache.jdo.tck.pc.mylib.PCRect;
+import org.apache.jdo.tck.pc.mylib.PCPoint;
 import org.apache.jdo.tck.util.BatchTestRunner;
 
 /**
@@ -77,7 +78,7 @@
 
     /** */
     private PCRect getPersistentNewInstance() {
-        PCRect obj = new PCRect();
+        PCRect obj = new PCRect(0, new PCPoint(1,5), new PCPoint(7,3));
         pm.makePersistent(obj); // obj should transition to persistent-new
         int curr = currentState(obj);
         if( curr != PERSISTENT_NEW ){

Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java Mon May 16 14:59:14 2005
@@ -125,10 +125,10 @@
         for( i = 0, value = startValue; i < n; ++i){
             if( !FieldsOfBigDecimal.isPersistent[i] ) continue;
             BigDecimal val = pi.get(i);
-            if(!val.equals(value)){
+            if(val.compareTo(value) != 0){
                 fail(ASSERTION_FAILED,
-                     "Incorrect value for " + FieldsOfBigDecimal.fieldSpecs[i] + 
-                     ", expected value " + value.toString() + 
+                     "Incorrect value for " + FieldsOfBigDecimal.fieldSpecs[i] +
+                     ", expected value " + value.toString() +
                      ", value is " + val.toString());
             }
         }

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm Mon May 16 14:59:14 2005
@@ -23,7 +23,9 @@
             <field name="fld_String" column="STRINGVAL"/>
             <field name="fld_Locale" column="LOCALEVAL"/>
             <field name="fld_Date" column="DATEVAL"/>
-            <field name="fld_BigDecimal" column="BIGDECIMALVAL"/>
+            <field name="fld_BigDecimal">
+                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
             <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm Mon May 16 14:59:14 2005
@@ -4,77 +4,219 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <field name="identifier" primary-key="true" column="IDENTIFIER"/>
-            <field name="BigDecimal1" column="BIG_DECIMAL1"/>
-            <field name="BigDecimal102" column="BIG_DECIMAL102"/>
-            <field name="BigDecimal103" column="BIG_DECIMAL103"/>
-            <field name="BigDecimal104" column="BIG_DECIMAL104"/>
-            <field name="BigDecimal108" column="BIG_DECIMAL108"/>
-            <field name="BigDecimal109" column="BIG_DECIMAL109"/>
-            <field name="BigDecimal11" column="BIG_DECIMAL11"/>
-            <field name="BigDecimal110" column="BIG_DECIMAL110"/>
-            <field name="BigDecimal112" column="BIG_DECIMAL112"/>
-            <field name="BigDecimal113" column="BIG_DECIMAL113"/>
-            <field name="BigDecimal114" column="BIG_DECIMAL114"/>
-            <field name="BigDecimal119" column="BIG_DECIMAL119"/>
-            <field name="BigDecimal12" column="BIG_DECIMAL12"/>
-            <field name="BigDecimal120" column="BIG_DECIMAL120"/>
-            <field name="BigDecimal121" column="BIG_DECIMAL121"/>
-            <field name="BigDecimal124" column="BIG_DECIMAL124"/>
-            <field name="BigDecimal125" column="BIG_DECIMAL125"/>
-            <field name="BigDecimal126" column="BIG_DECIMAL126"/>
-            <field name="BigDecimal128" column="BIG_DECIMAL128"/>
-            <field name="BigDecimal129" column="BIG_DECIMAL129"/>
-            <field name="BigDecimal13" column="BIG_DECIMAL13"/>
-            <field name="BigDecimal130" column="BIG_DECIMAL130"/>
-            <field name="BigDecimal138" column="BIG_DECIMAL138"/>
-            <field name="BigDecimal139" column="BIG_DECIMAL139"/>
-            <field name="BigDecimal140" column="BIG_DECIMAL140"/>
-            <field name="BigDecimal16" column="BIG_DECIMAL16"/>
-            <field name="BigDecimal17" column="BIG_DECIMAL17"/>
-            <field name="BigDecimal18" column="BIG_DECIMAL18"/>
-            <field name="BigDecimal2" column="BIG_DECIMAL2"/>
-            <field name="BigDecimal20" column="BIG_DECIMAL20"/>
-            <field name="BigDecimal21" column="BIG_DECIMAL21"/>
-            <field name="BigDecimal22" column="BIG_DECIMAL22"/>
-            <field name="BigDecimal30" column="BIG_DECIMAL30"/>
-            <field name="BigDecimal31" column="BIG_DECIMAL31"/>
-            <field name="BigDecimal32" column="BIG_DECIMAL32"/>
-            <field name="BigDecimal36" column="BIG_DECIMAL36"/>
-            <field name="BigDecimal37" column="BIG_DECIMAL37"/>
-            <field name="BigDecimal38" column="BIG_DECIMAL38"/>
-            <field name="BigDecimal4" column="BIG_DECIMAL4"/>
-            <field name="BigDecimal40" column="BIG_DECIMAL40"/>
-            <field name="BigDecimal41" column="BIG_DECIMAL41"/>
-            <field name="BigDecimal42" column="BIG_DECIMAL42"/>
-            <field name="BigDecimal47" column="BIG_DECIMAL47"/>
-            <field name="BigDecimal48" column="BIG_DECIMAL48"/>
-            <field name="BigDecimal49" column="BIG_DECIMAL49"/>
-            <field name="BigDecimal5" column="BIG_DECIMAL5"/>
-            <field name="BigDecimal52" column="BIG_DECIMAL52"/>
-            <field name="BigDecimal53" column="BIG_DECIMAL53"/>
-            <field name="BigDecimal54" column="BIG_DECIMAL54"/>
-            <field name="BigDecimal56" column="BIG_DECIMAL56"/>
-            <field name="BigDecimal57" column="BIG_DECIMAL57"/>
-            <field name="BigDecimal58" column="BIG_DECIMAL58"/>
-            <field name="BigDecimal6" column="BIG_DECIMAL6"/>
-            <field name="BigDecimal66" column="BIG_DECIMAL66"/>
-            <field name="BigDecimal67" column="BIG_DECIMAL67"/>
-            <field name="BigDecimal68" column="BIG_DECIMAL68"/>
-            <field name="BigDecimal72" column="BIG_DECIMAL72"/>
-            <field name="BigDecimal73" column="BIG_DECIMAL73"/>
-            <field name="BigDecimal74" column="BIG_DECIMAL74"/>
-            <field name="BigDecimal76" column="BIG_DECIMAL76"/>
-            <field name="BigDecimal77" column="BIG_DECIMAL77"/>
-            <field name="BigDecimal78" column="BIG_DECIMAL78"/>
-            <field name="BigDecimal83" column="BIG_DECIMAL83"/>
-            <field name="BigDecimal84" column="BIG_DECIMAL84"/>
-            <field name="BigDecimal85" column="BIG_DECIMAL85"/>
-            <field name="BigDecimal88" column="BIG_DECIMAL88"/>
-            <field name="BigDecimal89" column="BIG_DECIMAL89"/>
-            <field name="BigDecimal90" column="BIG_DECIMAL90"/>
-            <field name="BigDecimal92" column="BIG_DECIMAL92"/>
-            <field name="BigDecimal93" column="BIG_DECIMAL93"/>
-            <field name="BigDecimal94" column="BIG_DECIMAL94"/>
+            <field name="BigDecimal1">
+                <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal102">
+                <column name="BIG_DECIMAL102" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal103">
+                <column name="BIG_DECIMAL103" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal104">
+                <column name="BIG_DECIMAL104" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal108">
+                <column name="BIG_DECIMAL108" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal109">
+                <column name="BIG_DECIMAL109" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal11">
+                <column name="BIG_DECIMAL11" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal110">
+                <column name="BIG_DECIMAL110" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal112">
+                <column name="BIG_DECIMAL112" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal113">
+                <column name="BIG_DECIMAL113" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal114">
+                <column name="BIG_DECIMAL114" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal119">
+                <column name="BIG_DECIMAL119" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal12">
+                <column name="BIG_DECIMAL12" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal120">
+                <column name="BIG_DECIMAL120" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal121">
+                <column name="BIG_DECIMAL121" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal124">
+                <column name="BIG_DECIMAL124" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal125">
+                <column name="BIG_DECIMAL125" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal126">
+                <column name="BIG_DECIMAL126" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal128">
+                <column name="BIG_DECIMAL128" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal129">
+                <column name="BIG_DECIMAL129" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal13">
+                <column name="BIG_DECIMAL13" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal130">
+                <column name="BIG_DECIMAL130" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal138">
+                <column name="BIG_DECIMAL138" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal139">
+                <column name="BIG_DECIMAL139" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal140">
+                <column name="BIG_DECIMAL140" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal16">
+                <column name="BIG_DECIMAL16" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal17">
+                <column name="BIG_DECIMAL17" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal18">
+                <column name="BIG_DECIMAL18" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal2">
+                <column name="BIG_DECIMAL2" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal20">
+                <column name="BIG_DECIMAL20" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal21">
+                <column name="BIG_DECIMAL21" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal22">
+                <column name="BIG_DECIMAL22" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal30">
+                <column name="BIG_DECIMAL30" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal31">
+                <column name="BIG_DECIMAL31" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal32">
+                <column name="BIG_DECIMAL32" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal36">
+                <column name="BIG_DECIMAL36" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal37">
+                <column name="BIG_DECIMAL37" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal38">
+                <column name="BIG_DECIMAL38" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal4">
+                <column name="BIG_DECIMAL4" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal40">
+                <column name="BIG_DECIMAL40" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal41">
+                <column name="BIG_DECIMAL41" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal42">
+                <column name="BIG_DECIMAL42" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal47">
+                <column name="BIG_DECIMAL47" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal48">
+                <column name="BIG_DECIMAL48" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal49">
+                <column name="BIG_DECIMAL49" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal5">
+                <column name="BIG_DECIMAL5" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal52">
+                <column name="BIG_DECIMAL52" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal53">
+                <column name="BIG_DECIMAL53" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal54">
+                <column name="BIG_DECIMAL54" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal56">
+                <column name="BIG_DECIMAL56" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal57">
+                <column name="BIG_DECIMAL57" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal58">
+                <column name="BIG_DECIMAL58" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal6">
+                <column name="BIG_DECIMAL6" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal66">
+                <column name="BIG_DECIMAL66" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal67">
+                <column name="BIG_DECIMAL67" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal68">
+                <column name="BIG_DECIMAL68" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal72">
+                <column name="BIG_DECIMAL72" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal73">
+                <column name="BIG_DECIMAL73" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal74">
+                <column name="BIG_DECIMAL74" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal76">
+                <column name="BIG_DECIMAL76" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal77">
+                <column name="BIG_DECIMAL77" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal78">
+                <column name="BIG_DECIMAL78" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal83">
+                <column name="BIG_DECIMAL83" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal84">
+                <column name="BIG_DECIMAL84" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal85">
+                <column name="BIG_DECIMAL85" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal88">
+                <column name="BIG_DECIMAL88" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal89">
+                <column name="BIG_DECIMAL89" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal90">
+                <column name="BIG_DECIMAL90" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal92">
+                <column name="BIG_DECIMAL92" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal93">
+                <column name="BIG_DECIMAL93" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal94">
+                <column name="BIG_DECIMAL94" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
         </class>
     </package>
 </orm>

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="HashMapOfBigDecimal_String53" table="HASHMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfBigInteger_String54" column="HASHMAP_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="HashtableOfBigDecimal_String53" table="HASHTBL_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfBigInteger_String54" column="HASHTBL_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING">

Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -234,7 +234,7 @@
             <field name="TreeMapOfBigDecimal_String53" table="TREEMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfBigInteger_String54" column="TREEMAP_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/AllTypes-derby.orm Mon May 16 14:59:14 2005
@@ -23,7 +23,9 @@
             <field name="fld_String" column="STRINGVAL"/>
             <field name="fld_Locale" column="LOCALEVAL"/>
             <field name="fld_Date" column="DATEVAL"/>
-            <field name="fld_BigDecimal" column="BIGDECIMALVAL"/>
+            <field name="fld_BigDecimal">
+                <column name="BIGDECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
             <field name="fld_BigInteger" column="BIGINTEGERVAL"/>
         </class>
     </package>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfBigDecimal-derby.orm Mon May 16 14:59:14 2005
@@ -4,77 +4,219 @@
     <package name="org.apache.jdo.tck.pc.fieldtypes">
         <class name="FieldsOfBigDecimal" table="FIELDSOFBIGDECIMAL">
             <datastore-identity strategy="identity" column="IDENTIFIER"/>
-            <field name="BigDecimal1" column="BIG_DECIMAL1"/>
-            <field name="BigDecimal102" column="BIG_DECIMAL102"/>
-            <field name="BigDecimal103" column="BIG_DECIMAL103"/>
-            <field name="BigDecimal104" column="BIG_DECIMAL104"/>
-            <field name="BigDecimal108" column="BIG_DECIMAL108"/>
-            <field name="BigDecimal109" column="BIG_DECIMAL109"/>
-            <field name="BigDecimal11" column="BIG_DECIMAL11"/>
-            <field name="BigDecimal110" column="BIG_DECIMAL110"/>
-            <field name="BigDecimal112" column="BIG_DECIMAL112"/>
-            <field name="BigDecimal113" column="BIG_DECIMAL113"/>
-            <field name="BigDecimal114" column="BIG_DECIMAL114"/>
-            <field name="BigDecimal119" column="BIG_DECIMAL119"/>
-            <field name="BigDecimal12" column="BIG_DECIMAL12"/>
-            <field name="BigDecimal120" column="BIG_DECIMAL120"/>
-            <field name="BigDecimal121" column="BIG_DECIMAL121"/>
-            <field name="BigDecimal124" column="BIG_DECIMAL124"/>
-            <field name="BigDecimal125" column="BIG_DECIMAL125"/>
-            <field name="BigDecimal126" column="BIG_DECIMAL126"/>
-            <field name="BigDecimal128" column="BIG_DECIMAL128"/>
-            <field name="BigDecimal129" column="BIG_DECIMAL129"/>
-            <field name="BigDecimal13" column="BIG_DECIMAL13"/>
-            <field name="BigDecimal130" column="BIG_DECIMAL130"/>
-            <field name="BigDecimal138" column="BIG_DECIMAL138"/>
-            <field name="BigDecimal139" column="BIG_DECIMAL139"/>
-            <field name="BigDecimal140" column="BIG_DECIMAL140"/>
-            <field name="BigDecimal16" column="BIG_DECIMAL16"/>
-            <field name="BigDecimal17" column="BIG_DECIMAL17"/>
-            <field name="BigDecimal18" column="BIG_DECIMAL18"/>
-            <field name="BigDecimal2" column="BIG_DECIMAL2"/>
-            <field name="BigDecimal20" column="BIG_DECIMAL20"/>
-            <field name="BigDecimal21" column="BIG_DECIMAL21"/>
-            <field name="BigDecimal22" column="BIG_DECIMAL22"/>
-            <field name="BigDecimal30" column="BIG_DECIMAL30"/>
-            <field name="BigDecimal31" column="BIG_DECIMAL31"/>
-            <field name="BigDecimal32" column="BIG_DECIMAL32"/>
-            <field name="BigDecimal36" column="BIG_DECIMAL36"/>
-            <field name="BigDecimal37" column="BIG_DECIMAL37"/>
-            <field name="BigDecimal38" column="BIG_DECIMAL38"/>
-            <field name="BigDecimal4" column="BIG_DECIMAL4"/>
-            <field name="BigDecimal40" column="BIG_DECIMAL40"/>
-            <field name="BigDecimal41" column="BIG_DECIMAL41"/>
-            <field name="BigDecimal42" column="BIG_DECIMAL42"/>
-            <field name="BigDecimal47" column="BIG_DECIMAL47"/>
-            <field name="BigDecimal48" column="BIG_DECIMAL48"/>
-            <field name="BigDecimal49" column="BIG_DECIMAL49"/>
-            <field name="BigDecimal5" column="BIG_DECIMAL5"/>
-            <field name="BigDecimal52" column="BIG_DECIMAL52"/>
-            <field name="BigDecimal53" column="BIG_DECIMAL53"/>
-            <field name="BigDecimal54" column="BIG_DECIMAL54"/>
-            <field name="BigDecimal56" column="BIG_DECIMAL56"/>
-            <field name="BigDecimal57" column="BIG_DECIMAL57"/>
-            <field name="BigDecimal58" column="BIG_DECIMAL58"/>
-            <field name="BigDecimal6" column="BIG_DECIMAL6"/>
-            <field name="BigDecimal66" column="BIG_DECIMAL66"/>
-            <field name="BigDecimal67" column="BIG_DECIMAL67"/>
-            <field name="BigDecimal68" column="BIG_DECIMAL68"/>
-            <field name="BigDecimal72" column="BIG_DECIMAL72"/>
-            <field name="BigDecimal73" column="BIG_DECIMAL73"/>
-            <field name="BigDecimal74" column="BIG_DECIMAL74"/>
-            <field name="BigDecimal76" column="BIG_DECIMAL76"/>
-            <field name="BigDecimal77" column="BIG_DECIMAL77"/>
-            <field name="BigDecimal78" column="BIG_DECIMAL78"/>
-            <field name="BigDecimal83" column="BIG_DECIMAL83"/>
-            <field name="BigDecimal84" column="BIG_DECIMAL84"/>
-            <field name="BigDecimal85" column="BIG_DECIMAL85"/>
-            <field name="BigDecimal88" column="BIG_DECIMAL88"/>
-            <field name="BigDecimal89" column="BIG_DECIMAL89"/>
-            <field name="BigDecimal90" column="BIG_DECIMAL90"/>
-            <field name="BigDecimal92" column="BIG_DECIMAL92"/>
-            <field name="BigDecimal93" column="BIG_DECIMAL93"/>
-            <field name="BigDecimal94" column="BIG_DECIMAL94"/>
+            <field name="BigDecimal1">
+                <column name="BIG_DECIMAL1" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal102">
+                <column name="BIG_DECIMAL102" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal103">
+                <column name="BIG_DECIMAL103" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal104">
+                <column name="BIG_DECIMAL104" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal108">
+                <column name="BIG_DECIMAL108" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal109">
+                <column name="BIG_DECIMAL109" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal11">
+                <column name="BIG_DECIMAL11" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal110">
+                <column name="BIG_DECIMAL110" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal112">
+                <column name="BIG_DECIMAL112" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal113">
+                <column name="BIG_DECIMAL113" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal114">
+                <column name="BIG_DECIMAL114" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal119">
+                <column name="BIG_DECIMAL119" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal12">
+                <column name="BIG_DECIMAL12" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal120">
+                <column name="BIG_DECIMAL120" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal121">
+                <column name="BIG_DECIMAL121" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal124">
+                <column name="BIG_DECIMAL124" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal125">
+                <column name="BIG_DECIMAL125" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal126">
+                <column name="BIG_DECIMAL126" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal128">
+                <column name="BIG_DECIMAL128" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal129">
+                <column name="BIG_DECIMAL129" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal13">
+                <column name="BIG_DECIMAL13" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal130">
+                <column name="BIG_DECIMAL130" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal138">
+                <column name="BIG_DECIMAL138" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal139">
+                <column name="BIG_DECIMAL139" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal140">
+                <column name="BIG_DECIMAL140" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal16">
+                <column name="BIG_DECIMAL16" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal17">
+                <column name="BIG_DECIMAL17" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal18">
+                <column name="BIG_DECIMAL18" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal2">
+                <column name="BIG_DECIMAL2" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal20">
+                <column name="BIG_DECIMAL20" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal21">
+                <column name="BIG_DECIMAL21" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal22">
+                <column name="BIG_DECIMAL22" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal30">
+                <column name="BIG_DECIMAL30" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal31">
+                <column name="BIG_DECIMAL31" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal32">
+                <column name="BIG_DECIMAL32" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal36">
+                <column name="BIG_DECIMAL36" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal37">
+                <column name="BIG_DECIMAL37" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal38">
+                <column name="BIG_DECIMAL38" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal4">
+                <column name="BIG_DECIMAL4" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal40">
+                <column name="BIG_DECIMAL40" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal41">
+                <column name="BIG_DECIMAL41" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal42">
+                <column name="BIG_DECIMAL42" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal47">
+                <column name="BIG_DECIMAL47" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal48">
+                <column name="BIG_DECIMAL48" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal49">
+                <column name="BIG_DECIMAL49" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal5">
+                <column name="BIG_DECIMAL5" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal52">
+                <column name="BIG_DECIMAL52" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal53">
+                <column name="BIG_DECIMAL53" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal54">
+                <column name="BIG_DECIMAL54" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal56">
+                <column name="BIG_DECIMAL56" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal57">
+                <column name="BIG_DECIMAL57" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal58">
+                <column name="BIG_DECIMAL58" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal6">
+                <column name="BIG_DECIMAL6" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal66">
+                <column name="BIG_DECIMAL66" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal67">
+                <column name="BIG_DECIMAL67" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal68">
+                <column name="BIG_DECIMAL68" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal72">
+                <column name="BIG_DECIMAL72" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal73">
+                <column name="BIG_DECIMAL73" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal74">
+                <column name="BIG_DECIMAL74" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal76">
+                <column name="BIG_DECIMAL76" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal77">
+                <column name="BIG_DECIMAL77" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal78">
+                <column name="BIG_DECIMAL78" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal83">
+                <column name="BIG_DECIMAL83" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal84">
+                <column name="BIG_DECIMAL84" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal85">
+                <column name="BIG_DECIMAL85" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal88">
+                <column name="BIG_DECIMAL88" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal89">
+                <column name="BIG_DECIMAL89" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal90">
+                <column name="BIG_DECIMAL90" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal92">
+                <column name="BIG_DECIMAL92" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal93">
+                <column name="BIG_DECIMAL93" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
+            <field name="BigDecimal94">
+                <column name="BIG_DECIMAL94" jdbc-type="DECIMAL" length="11" scale="4"/>
+            </field>
         </class>
     </package>
 </orm>

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashMapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="HashMapOfBigDecimal_String53" table="HASHMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashMapOfBigInteger_String54" column="HASHMAP_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/HashtableStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="HashtableOfBigDecimal_String53" table="HASHTBL_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="HashtableOfBigInteger_String54" column="HASHTBL_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="MapOfBigDecimal_String53" table="MAP_OF_BIG_DECIMAL53_STRING">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="MapOfBigInteger_String54" column="MAP_OF_BIG_INTEGER54_STRING">

Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeMapStringValueCollections-derby.orm Mon May 16 14:59:14 2005
@@ -229,7 +229,7 @@
             <field name="TreeMapOfBigDecimal_String53" table="TREEMAP_BIG_DECIMAL53_STR">
                 <join column="IDENTIFIER"/>
                 <value column="STRING"/>
-                <key column="BIG_DECIMALVAL"/>
+                <key column="BIG_DECIMALVAL" jdbc-type="DECIMAL" length="11" scale="4"/>
                 <order column="INDEX"/>
             </field>
             <field name="TreeMapOfBigInteger_String54" column="TREEMAP_BIG_INTEGER54_STR">

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Mon May 16 14:59:14 2005
@@ -679,7 +679,7 @@
     STRINGVAL VARCHAR(255) NOT NULL,
     LOCALEVAL CHAR(20) NOT NULL,
     DATEVAL DATE NOT NULL,
-    BIGDECIMALVAL DECIMAL(19),
+    BIGDECIMALVAL DECIMAL(11,4)
     BIGINTEGERVAL BIGINT
 );
 
@@ -688,78 +688,78 @@
 CREATE TABLE FIELDSOFBIGDECIMAL
 (
     IDENTIFIER INTEGER NOT NULL,
-    BIG_DECIMAL0 DECIMAL(19),
-    BIG_DECIMAL1 DECIMAL(19),
-    BIG_DECIMAL102 DECIMAL(19),
-    BIG_DECIMAL103 DECIMAL(19),
-    BIG_DECIMAL104 DECIMAL(19),
-    BIG_DECIMAL108 DECIMAL(19),
-    BIG_DECIMAL109 DECIMAL(19),
-    BIG_DECIMAL11 DECIMAL(19),
-    BIG_DECIMAL110 DECIMAL(19),
-    BIG_DECIMAL112 DECIMAL(19),
-    BIG_DECIMAL113 DECIMAL(19),
-    BIG_DECIMAL114 DECIMAL(19),
-    BIG_DECIMAL119 DECIMAL(19),
-    BIG_DECIMAL12 DECIMAL(19),
-    BIG_DECIMAL120 DECIMAL(19),
-    BIG_DECIMAL121 DECIMAL(19),
-    BIG_DECIMAL124 DECIMAL(19),
-    BIG_DECIMAL125 DECIMAL(19),
-    BIG_DECIMAL126 DECIMAL(19),
-    BIG_DECIMAL128 DECIMAL(19),
-    BIG_DECIMAL129 DECIMAL(19),
-    BIG_DECIMAL13 DECIMAL(19),
-    BIG_DECIMAL130 DECIMAL(19),
-    BIG_DECIMAL138 DECIMAL(19),
-    BIG_DECIMAL139 DECIMAL(19),
-    BIG_DECIMAL140 DECIMAL(19),
-    BIG_DECIMAL16 DECIMAL(19),
-    BIG_DECIMAL17 DECIMAL(19),
-    BIG_DECIMAL18 DECIMAL(19),
-    BIG_DECIMAL2 DECIMAL(19),
-    BIG_DECIMAL20 DECIMAL(19),
-    BIG_DECIMAL21 DECIMAL(19),
-    BIG_DECIMAL22 DECIMAL(19),
-    BIG_DECIMAL30 DECIMAL(19),
-    BIG_DECIMAL31 DECIMAL(19),
-    BIG_DECIMAL32 DECIMAL(19),
-    BIG_DECIMAL36 DECIMAL(19),
-    BIG_DECIMAL37 DECIMAL(19),
-    BIG_DECIMAL38 DECIMAL(19),
-    BIG_DECIMAL4 DECIMAL(19),
-    BIG_DECIMAL40 DECIMAL(19),
-    BIG_DECIMAL41 DECIMAL(19),
-    BIG_DECIMAL42 DECIMAL(19),
-    BIG_DECIMAL47 DECIMAL(19),
-    BIG_DECIMAL48 DECIMAL(19),
-    BIG_DECIMAL49 DECIMAL(19),
-    BIG_DECIMAL5 DECIMAL(19),
-    BIG_DECIMAL52 DECIMAL(19),
-    BIG_DECIMAL53 DECIMAL(19),
-    BIG_DECIMAL54 DECIMAL(19),
-    BIG_DECIMAL56 DECIMAL(19),
-    BIG_DECIMAL57 DECIMAL(19),
-    BIG_DECIMAL58 DECIMAL(19),
-    BIG_DECIMAL6 DECIMAL(19),
-    BIG_DECIMAL66 DECIMAL(19),
-    BIG_DECIMAL67 DECIMAL(19),
-    BIG_DECIMAL68 DECIMAL(19),
-    BIG_DECIMAL72 DECIMAL(19),
-    BIG_DECIMAL73 DECIMAL(19),
-    BIG_DECIMAL74 DECIMAL(19),
-    BIG_DECIMAL76 DECIMAL(19),
-    BIG_DECIMAL77 DECIMAL(19),
-    BIG_DECIMAL78 DECIMAL(19),
-    BIG_DECIMAL83 DECIMAL(19),
-    BIG_DECIMAL84 DECIMAL(19),
-    BIG_DECIMAL85 DECIMAL(19),
-    BIG_DECIMAL88 DECIMAL(19),
-    BIG_DECIMAL89 DECIMAL(19),
-    BIG_DECIMAL90 DECIMAL(19),
-    BIG_DECIMAL92 DECIMAL(19),
-    BIG_DECIMAL93 DECIMAL(19),
-    BIG_DECIMAL94 DECIMAL(19)
+    BIG_DECIMAL0 DECIMAL(11,4),
+    BIG_DECIMAL1 DECIMAL(11,4),
+    BIG_DECIMAL102 DECIMAL(11,4),
+    BIG_DECIMAL103 DECIMAL(11,4),
+    BIG_DECIMAL104 DECIMAL(11,4),
+    BIG_DECIMAL108 DECIMAL(11,4),
+    BIG_DECIMAL109 DECIMAL(11,4),
+    BIG_DECIMAL11 DECIMAL(11,4),
+    BIG_DECIMAL110 DECIMAL(11,4),
+    BIG_DECIMAL112 DECIMAL(11,4),
+    BIG_DECIMAL113 DECIMAL(11,4),
+    BIG_DECIMAL114 DECIMAL(11,4),
+    BIG_DECIMAL119 DECIMAL(11,4),
+    BIG_DECIMAL12 DECIMAL(11,4),
+    BIG_DECIMAL120 DECIMAL(11,4),
+    BIG_DECIMAL121 DECIMAL(11,4),
+    BIG_DECIMAL124 DECIMAL(11,4),
+    BIG_DECIMAL125 DECIMAL(11,4),
+    BIG_DECIMAL126 DECIMAL(11,4),
+    BIG_DECIMAL128 DECIMAL(11,4),
+    BIG_DECIMAL129 DECIMAL(11,4),
+    BIG_DECIMAL13 DECIMAL(11,4),
+    BIG_DECIMAL130 DECIMAL(11,4),
+    BIG_DECIMAL138 DECIMAL(11,4),
+    BIG_DECIMAL139 DECIMAL(11,4),
+    BIG_DECIMAL140 DECIMAL(11,4),
+    BIG_DECIMAL16 DECIMAL(11,4),
+    BIG_DECIMAL17 DECIMAL(11,4),
+    BIG_DECIMAL18 DECIMAL(11,4),
+    BIG_DECIMAL2 DECIMAL(11,4),
+    BIG_DECIMAL20 DECIMAL(11,4),
+    BIG_DECIMAL21 DECIMAL(11,4),
+    BIG_DECIMAL22 DECIMAL(11,4),
+    BIG_DECIMAL30 DECIMAL(11,4),
+    BIG_DECIMAL31 DECIMAL(11,4),
+    BIG_DECIMAL32 DECIMAL(11,4),
+    BIG_DECIMAL36 DECIMAL(11,4),
+    BIG_DECIMAL37 DECIMAL(11,4),
+    BIG_DECIMAL38 DECIMAL(11,4),
+    BIG_DECIMAL4 DECIMAL(11,4),
+    BIG_DECIMAL40 DECIMAL(11,4),
+    BIG_DECIMAL41 DECIMAL(11,4),
+    BIG_DECIMAL42 DECIMAL(11,4),
+    BIG_DECIMAL47 DECIMAL(11,4),
+    BIG_DECIMAL48 DECIMAL(11,4),
+    BIG_DECIMAL49 DECIMAL(11,4),
+    BIG_DECIMAL5 DECIMAL(11,4),
+    BIG_DECIMAL52 DECIMAL(11,4),
+    BIG_DECIMAL53 DECIMAL(11,4),
+    BIG_DECIMAL54 DECIMAL(11,4),
+    BIG_DECIMAL56 DECIMAL(11,4),
+    BIG_DECIMAL57 DECIMAL(11,4),
+    BIG_DECIMAL58 DECIMAL(11,4),
+    BIG_DECIMAL6 DECIMAL(11,4),
+    BIG_DECIMAL66 DECIMAL(11,4),
+    BIG_DECIMAL67 DECIMAL(11,4),
+    BIG_DECIMAL68 DECIMAL(11,4),
+    BIG_DECIMAL72 DECIMAL(11,4),
+    BIG_DECIMAL73 DECIMAL(11,4),
+    BIG_DECIMAL74 DECIMAL(11,4),
+    BIG_DECIMAL76 DECIMAL(11,4),
+    BIG_DECIMAL77 DECIMAL(11,4),
+    BIG_DECIMAL78 DECIMAL(11,4),
+    BIG_DECIMAL83 DECIMAL(11,4),
+    BIG_DECIMAL84 DECIMAL(11,4),
+    BIG_DECIMAL85 DECIMAL(11,4),
+    BIG_DECIMAL88 DECIMAL(11,4),
+    BIG_DECIMAL89 DECIMAL(11,4),
+    BIG_DECIMAL90 DECIMAL(11,4),
+    BIG_DECIMAL92 DECIMAL(11,4),
+    BIG_DECIMAL93 DECIMAL(11,4),
+    BIG_DECIMAL94 DECIMAL(11,4)
 );
 
 ALTER TABLE FIELDSOFBIGDECIMAL ADD CONSTRAINT FIELDSOFBIGDPP_PK PRIMARY KEY (IDENTIFIER);
@@ -5461,7 +5461,7 @@
 CREATE TABLE HASHMAP_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -5807,7 +5807,7 @@
 CREATE TABLE HASHTBL_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -6153,7 +6153,7 @@
 CREATE TABLE TREEMAP_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -6499,7 +6499,7 @@
 CREATE TABLE MAP_OF_BIG_DECIMAL53_STRING (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=170474&r1=170473&r2=170474&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Mon May 16 14:59:14 2005
@@ -679,7 +679,7 @@
     STRINGVAL VARCHAR(255) NOT NULL,
     LOCALEVAL CHAR(20) NOT NULL,
     DATEVAL DATE NOT NULL,
-    BIGDECIMALVAL DECIMAL(19),
+    BIGDECIMALVAL DECIMAL(11,4),
     BIGINTEGERVAL BIGINT
 );
 
@@ -688,78 +688,78 @@
 CREATE TABLE FIELDSOFBIGDECIMAL
 (
     IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
-    BIG_DECIMAL0 DECIMAL(19),
-    BIG_DECIMAL1 DECIMAL(19),
-    BIG_DECIMAL102 DECIMAL(19),
-    BIG_DECIMAL103 DECIMAL(19),
-    BIG_DECIMAL104 DECIMAL(19),
-    BIG_DECIMAL108 DECIMAL(19),
-    BIG_DECIMAL109 DECIMAL(19),
-    BIG_DECIMAL11 DECIMAL(19),
-    BIG_DECIMAL110 DECIMAL(19),
-    BIG_DECIMAL112 DECIMAL(19),
-    BIG_DECIMAL113 DECIMAL(19),
-    BIG_DECIMAL114 DECIMAL(19),
-    BIG_DECIMAL119 DECIMAL(19),
-    BIG_DECIMAL12 DECIMAL(19),
-    BIG_DECIMAL120 DECIMAL(19),
-    BIG_DECIMAL121 DECIMAL(19),
-    BIG_DECIMAL124 DECIMAL(19),
-    BIG_DECIMAL125 DECIMAL(19),
-    BIG_DECIMAL126 DECIMAL(19),
-    BIG_DECIMAL128 DECIMAL(19),
-    BIG_DECIMAL129 DECIMAL(19),
-    BIG_DECIMAL13 DECIMAL(19),
-    BIG_DECIMAL130 DECIMAL(19),
-    BIG_DECIMAL138 DECIMAL(19),
-    BIG_DECIMAL139 DECIMAL(19),
-    BIG_DECIMAL140 DECIMAL(19),
-    BIG_DECIMAL16 DECIMAL(19),
-    BIG_DECIMAL17 DECIMAL(19),
-    BIG_DECIMAL18 DECIMAL(19),
-    BIG_DECIMAL2 DECIMAL(19),
-    BIG_DECIMAL20 DECIMAL(19),
-    BIG_DECIMAL21 DECIMAL(19),
-    BIG_DECIMAL22 DECIMAL(19),
-    BIG_DECIMAL30 DECIMAL(19),
-    BIG_DECIMAL31 DECIMAL(19),
-    BIG_DECIMAL32 DECIMAL(19),
-    BIG_DECIMAL36 DECIMAL(19),
-    BIG_DECIMAL37 DECIMAL(19),
-    BIG_DECIMAL38 DECIMAL(19),
-    BIG_DECIMAL4 DECIMAL(19),
-    BIG_DECIMAL40 DECIMAL(19),
-    BIG_DECIMAL41 DECIMAL(19),
-    BIG_DECIMAL42 DECIMAL(19),
-    BIG_DECIMAL47 DECIMAL(19),
-    BIG_DECIMAL48 DECIMAL(19),
-    BIG_DECIMAL49 DECIMAL(19),
-    BIG_DECIMAL5 DECIMAL(19),
-    BIG_DECIMAL52 DECIMAL(19),
-    BIG_DECIMAL53 DECIMAL(19),
-    BIG_DECIMAL54 DECIMAL(19),
-    BIG_DECIMAL56 DECIMAL(19),
-    BIG_DECIMAL57 DECIMAL(19),
-    BIG_DECIMAL58 DECIMAL(19),
-    BIG_DECIMAL6 DECIMAL(19),
-    BIG_DECIMAL66 DECIMAL(19),
-    BIG_DECIMAL67 DECIMAL(19),
-    BIG_DECIMAL68 DECIMAL(19),
-    BIG_DECIMAL72 DECIMAL(19),
-    BIG_DECIMAL73 DECIMAL(19),
-    BIG_DECIMAL74 DECIMAL(19),
-    BIG_DECIMAL76 DECIMAL(19),
-    BIG_DECIMAL77 DECIMAL(19),
-    BIG_DECIMAL78 DECIMAL(19),
-    BIG_DECIMAL83 DECIMAL(19),
-    BIG_DECIMAL84 DECIMAL(19),
-    BIG_DECIMAL85 DECIMAL(19),
-    BIG_DECIMAL88 DECIMAL(19),
-    BIG_DECIMAL89 DECIMAL(19),
-    BIG_DECIMAL90 DECIMAL(19),
-    BIG_DECIMAL92 DECIMAL(19),
-    BIG_DECIMAL93 DECIMAL(19),
-    BIG_DECIMAL94 DECIMAL(19)
+    BIG_DECIMAL0 DECIMAL(11,4),
+    BIG_DECIMAL1 DECIMAL(11,4),
+    BIG_DECIMAL102 DECIMAL(11,4),
+    BIG_DECIMAL103 DECIMAL(11,4),
+    BIG_DECIMAL104 DECIMAL(11,4),
+    BIG_DECIMAL108 DECIMAL(11,4),
+    BIG_DECIMAL109 DECIMAL(11,4),
+    BIG_DECIMAL11 DECIMAL(11,4),
+    BIG_DECIMAL110 DECIMAL(11,4),
+    BIG_DECIMAL112 DECIMAL(11,4),
+    BIG_DECIMAL113 DECIMAL(11,4),
+    BIG_DECIMAL114 DECIMAL(11,4),
+    BIG_DECIMAL111,4 DECIMAL(11,4),
+    BIG_DECIMAL12 DECIMAL(11,4),
+    BIG_DECIMAL120 DECIMAL(11,4),
+    BIG_DECIMAL121 DECIMAL(11,4),
+    BIG_DECIMAL124 DECIMAL(11,4),
+    BIG_DECIMAL125 DECIMAL(11,4),
+    BIG_DECIMAL126 DECIMAL(11,4),
+    BIG_DECIMAL128 DECIMAL(11,4),
+    BIG_DECIMAL129 DECIMAL(11,4),
+    BIG_DECIMAL13 DECIMAL(11,4),
+    BIG_DECIMAL130 DECIMAL(11,4),
+    BIG_DECIMAL138 DECIMAL(11,4),
+    BIG_DECIMAL139 DECIMAL(11,4),
+    BIG_DECIMAL140 DECIMAL(11,4),
+    BIG_DECIMAL16 DECIMAL(11,4),
+    BIG_DECIMAL17 DECIMAL(11,4),
+    BIG_DECIMAL18 DECIMAL(11,4),
+    BIG_DECIMAL2 DECIMAL(11,4),
+    BIG_DECIMAL20 DECIMAL(11,4),
+    BIG_DECIMAL21 DECIMAL(11,4),
+    BIG_DECIMAL22 DECIMAL(11,4),
+    BIG_DECIMAL30 DECIMAL(11,4),
+    BIG_DECIMAL31 DECIMAL(11,4),
+    BIG_DECIMAL32 DECIMAL(11,4),
+    BIG_DECIMAL36 DECIMAL(11,4),
+    BIG_DECIMAL37 DECIMAL(11,4),
+    BIG_DECIMAL38 DECIMAL(11,4),
+    BIG_DECIMAL4 DECIMAL(11,4),
+    BIG_DECIMAL40 DECIMAL(11,4),
+    BIG_DECIMAL41 DECIMAL(11,4),
+    BIG_DECIMAL42 DECIMAL(11,4),
+    BIG_DECIMAL47 DECIMAL(11,4),
+    BIG_DECIMAL48 DECIMAL(11,4),
+    BIG_DECIMAL49 DECIMAL(11,4),
+    BIG_DECIMAL5 DECIMAL(11,4),
+    BIG_DECIMAL52 DECIMAL(11,4),
+    BIG_DECIMAL53 DECIMAL(11,4),
+    BIG_DECIMAL54 DECIMAL(11,4),
+    BIG_DECIMAL56 DECIMAL(11,4),
+    BIG_DECIMAL57 DECIMAL(11,4),
+    BIG_DECIMAL58 DECIMAL(11,4),
+    BIG_DECIMAL6 DECIMAL(11,4),
+    BIG_DECIMAL66 DECIMAL(11,4),
+    BIG_DECIMAL67 DECIMAL(11,4),
+    BIG_DECIMAL68 DECIMAL(11,4),
+    BIG_DECIMAL72 DECIMAL(11,4),
+    BIG_DECIMAL73 DECIMAL(11,4),
+    BIG_DECIMAL74 DECIMAL(11,4),
+    BIG_DECIMAL76 DECIMAL(11,4),
+    BIG_DECIMAL77 DECIMAL(11,4),
+    BIG_DECIMAL78 DECIMAL(11,4),
+    BIG_DECIMAL83 DECIMAL(11,4),
+    BIG_DECIMAL84 DECIMAL(11,4),
+    BIG_DECIMAL85 DECIMAL(11,4),
+    BIG_DECIMAL88 DECIMAL(11,4),
+    BIG_DECIMAL89 DECIMAL(11,4),
+    BIG_DECIMAL90 DECIMAL(11,4),
+    BIG_DECIMAL92 DECIMAL(11,4),
+    BIG_DECIMAL93 DECIMAL(11,4),
+    BIG_DECIMAL94 DECIMAL(11,4)
 );
 
 ALTER TABLE FIELDSOFBIGDECIMAL ADD CONSTRAINT FIELDSOFBIGDPP_PK PRIMARY KEY (IDENTIFIER);
@@ -5461,7 +5461,7 @@
 CREATE TABLE HASHMAP_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHMAPSTRINGVALUE_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -5807,7 +5807,7 @@
 CREATE TABLE HASHTBL_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES HASHTBLSTRINGVALUE_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -6153,7 +6153,7 @@
 CREATE TABLE TREEMAP_BIG_DECIMAL53_STR (
     IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGVALUE_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );
 
@@ -6499,7 +6499,7 @@
 CREATE TABLE MAP_OF_BIG_DECIMAL53_STRING (
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL GENERATED ALWAYS AS IDENTITY,
     VALUEVAL INTEGER NOT NULL,
-    KEYVAL DECIMAL(19),
+    KEYVAL DECIMAL(11,4),
     INDEX INTEGER NOT NULL
 );