Index: src/test/resources/ctf/jdo/tc0x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc0x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc0x/mapping.xml	(working copy)
@@ -35,7 +35,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="value1" type="integer">
+    <field name="value1" type="integer" required="true">
       <sql name="value1" type="integer" />
     </field>
   </class>
@@ -47,7 +47,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="value1" type="integer">
+    <field name="value1" type="integer" required="true">
       <sql name="value1" type="integer" />
     </field>
   </class>
@@ -59,7 +59,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="value1" type="integer">
+    <field name="value1" type="integer" >
       <sql name="value1" type="integer" />
     </field>
   </class>
Index: src/test/resources/ctf/jdo/tc1x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc1x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc1x/mapping.xml	(working copy)
@@ -36,10 +36,10 @@
       <sql name="id" type="integer"/>
     </field>
     <field name="creationTime" type="java.util.Date" required="true">
-      <sql name="ctime" type="timestamp" />
+      <sql name="ctime" type="date" />
     </field>
     <field name="modificationTime" type="java.util.Date" required="false">
-      <sql name="mtime" type="timestamp" dirty="ignore" />
+      <sql name="mtime" type="date" dirty="ignore" />
     </field>
     <field name="value1" type="string"  required="true">
       <sql name="value1" type="varchar" />
@@ -72,7 +72,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer"/>
     </field>
-    <field name="persistent" type="ctf.jdo.tc1x.PersistentObject">
+    <field name="persistent" type="ctf.jdo.tc1x.PersistentObject"  required="true">
       <sql name="persist_id" />
     </field>
   </class>
@@ -85,10 +85,10 @@
       <sql name="id" type="numeric" />
     </field>
     <field name="date" type="date">
-      <sql name="tdt" type="timestamp" />
+      <sql name="tdt" type="date" />
     </field>
     <field name="time" type="date">
-      <sql name="ttm" type="timestamp" dirty="ignore" />
+      <sql name="ttm" type="date" dirty="ignore" />
     </field>
     <field name="intValue" type="integer" required="false" >
       <sql name="int_val" type="integer" />
@@ -337,7 +337,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
+    <field name="name" type="string" required="true">
       <sql name="name" type="varchar" />
     </field>
     <field name="contract" type="ctf.jdo.tc1x.PrimaryKeysContract" collection="arraylist" >
Index: src/test/resources/ctf/jdo/tc3x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc3x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc3x/mapping.xml	(working copy)
@@ -43,10 +43,10 @@
       <sql name="id" type="integer"/>
     </field>
     <field name="creationTime" type="java.util.Date" required="true">
-      <sql name="ctime" type="timestamp" />
+      <sql name="ctime" type="date" />
     </field>
     <field name="modificationTime" type="java.util.Date" required="false">
-      <sql name="mtime" type="timestamp" dirty="ignore" />
+      <sql name="mtime" type="date" dirty="ignore" />
     </field>
     <field name="value1" type="string"  required="true">
       <sql name="value1" type="varchar" />
Index: src/test/resources/ctf/jdo/tc7x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc7x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc7x/mapping.xml	(working copy)
@@ -15,7 +15,7 @@
         <field name="people" type="ctf.jdo.tc7x.ManyPerson" 
             collection="collection" required="false" set-method="setPeople" 
             get-method="getPeople">
-            <sql many-table="tc7x_group_person"/>
+            <sql many-table="tc7x_group_person" many-key="gid"/>
         </field>
     </class>
     
@@ -36,7 +36,7 @@
         </field>
         <field name="group" type="ctf.jdo.tc7x.ManyGroup" 
             collection="collection" required="false">
-            <sql many-table="tc7x_group_person"/>
+            <sql many-table="tc7x_group_person" many-key="pid"/>
         </field>
     </class>
     
@@ -53,7 +53,7 @@
         </field>
         <field name="people" type="ctf.jdo.tc7x.ManyPersonKeyGen" 
             collection="collection" required="false" >
-            <sql many-table="tc7x_group_person"/>
+            <sql many-table="tc7x_group_person" many-key="gid"/>
         </field>
     </class>
     
@@ -76,7 +76,7 @@
         </field>
         <field name="group" type="ctf.jdo.tc7x.ManyGroupKeyGen" 
             collection="collection" required="false">
-            <sql many-table="tc7x_group_person"/>
+            <sql many-table="tc7x_group_person" many-key="pid"/>
         </field>
     </class>
     
@@ -103,10 +103,6 @@
         <field name="id" type="integer">
             <sql name="id" type="integer" />
         </field>
-        <!--
-    <field name="dummy" type="integer" >
-      <sql name="dum" type="integer" />
-    </fild> -->
     </class>
     
     <class name="ctf.jdo.tc7x.Item" identity="id">
@@ -347,7 +343,7 @@
         <field name="id1" type="integer" >
             <sql name="id_1" type="integer"/>
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
             <sql name="name" type="char" />
         </field>
     </class>
@@ -358,7 +354,7 @@
         <field name="id" type="integer" >
           <sql name="id" type="integer"/>
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
           <sql name="name" type="char" />
         </field>
         <field name="associatedOne" type="ctf.jdo.tc7x.AutostoreAssociated1">
@@ -372,7 +368,7 @@
         <field name="id" type="integer" >
           <sql name="id" type="integer"/>
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
           <sql name="name" type="char" />
         </field>
       </class>
@@ -397,7 +393,7 @@
         <field name="id" type="integer" >
           <sql name="id" type="integer"/>
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
           <sql name="name" type="char" />
         </field>
         <field name="main" type="ctf.jdo.tc7x.AutostoreMainMany">
@@ -405,4 +401,4 @@
         </field>
       </class>
     
-</mapping>
\ No newline at end of file
+</mapping>
Index: src/test/resources/ctf/jdo/tc8x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc8x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc8x/mapping.xml	(working copy)
@@ -8,7 +8,7 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
             <sql name="name" type="char" />
         </field>
         <field name="entities" type="ctf.jdo.tc8x.SelfReferentialParent" 
@@ -22,8 +22,8 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="description" type="string">
-            <sql name="descr" type="char" />
+        <field name="description" type="string" required="true">
+            <sql name="descr" type="varchar" />
         </field>
     </class>
 
@@ -35,8 +35,8 @@
         <field name="depends" type="ctf.jdo.tc8x.DependentObject">
             <sql many-key="master_id"/>
         </field>
-        <field name="descrip" type="string">
-            <sql name="descrip"/>
+        <field name="descrip" type="string" required="true">
+            <sql name="descrip" type="varchar"/>
         </field>
     </class>
 
@@ -50,7 +50,7 @@
             <sql name="master_id"/>
         </field>
         <field name="descrip" type="string">
-            <sql name="descrip"/>
+            <sql name="descrip" type="varchar"/>
         </field>
     </class>
 
@@ -63,7 +63,7 @@
             <sql many-key="master_id"/>
         </field>
         <field name="descrip" type="string">
-            <sql name="descrip"/>
+            <sql name="descrip" type="varchar"/>
         </field>
     </class>
 
@@ -73,11 +73,11 @@
         <field name="id" type="int">
             <sql name="id"/>
         </field>
-        <field name="master" type="ctf.jdo.tc8x.MasterObjectNoKeyGen">
+        <field name="master" type="ctf.jdo.tc8x.MasterObjectNoKeyGen" required="true">
             <sql name="master_id"/>
         </field>
-        <field name="descrip" type="string">
-            <sql name="descrip"/>
+        <field name="descrip" type="string" required="true">
+            <sql name="descrip" type="varchar"/>
         </field>
     </class>
 
@@ -87,7 +87,7 @@
             <sql name="id" type="integer"/>
         </field>
         <field name="name" type="string">
-            <sql name="name" type="char" />
+            <sql name="name" type="varchar" />
         </field>
     </class>
 
@@ -97,7 +97,7 @@
             <sql name="id" type="integer"/>
         </field>
         <field name="description" type="string">
-            <sql name="descr" type="char" />
+            <sql name="descr" type="varchar" />
         </field>
     </class>
 
@@ -109,8 +109,8 @@
         <field name="id2" type="integer" identity="true">
             <sql name="id2" type="integer"/>
         </field>
-        <field name="name" type="string">
-            <sql name="name" type="char" />
+        <field name="name" type="string" required="true">
+            <sql name="name" type="varchar" />
         </field>
     </class>
 
@@ -122,8 +122,8 @@
         <field name="id2" type="integer" identity="true">
             <sql name="id2" type="integer"/>
         </field>
-        <field name="description" type="string">
-            <sql name="descr" type="char" />
+        <field name="description" type="string" required="true">
+            <sql name="descr" type="varchar" />
         </field>
     </class>
 
@@ -134,8 +134,8 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="name" type="string">
-            <sql name="name" type="char"/>
+        <field name="name" type="string" required="true">
+            <sql name="name" type="varchar"/>
         </field>
         <field name="property1" type="integer">
             <sql name="propty1" type="integer" transient="true"/>
@@ -159,8 +159,8 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="description" type="string">
-            <sql name="descr" type="char" />
+        <field name="description" type="string" required="true">
+            <sql name="descr" type="varchar" />
         </field>
     </class>
 
@@ -169,8 +169,8 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="description" type="string">
-            <sql name="descr" type="char" />
+        <field name="description" type="string" required="true">
+            <sql name="descr" type="varchar" />
         </field>
     </class>
     
@@ -179,11 +179,11 @@
         <field name="id" type="integer">
             <sql name="id" type="integer" />
         </field>
-        <field name="name" type="string">
-            <sql name="name" type="char" />
+        <field name="name" type="string" required="true">
+            <sql name="name" type="varchar" />
         </field>
-        <field name="kind" type="ctf.jdo.tc8x.KindEnum">
-            <sql name="kind" type="char" />
+        <field name="kind" type="ctf.jdo.tc8x.KindEnum" required="true">
+            <sql name="kind" type="varchar" />
         </field>
     </class>
 
@@ -212,7 +212,7 @@
         <field name="id" type="integer" >
             <sql name="id" type="integer"/>
         </field>
-        <field name="description" type="string">
+        <field name="description" type="string" required="true">
             <sql name="descr" type="varchar"/>
         </field>
         <field name="child" type="ctf.jdo.tc8x.Lazy1to1Child" lazy="true">
@@ -236,11 +236,11 @@
         <field name="id" type="long">
             <sql name="ID" type="bigint"/>
         </field>
-        <field name="firstName" type="string">
-            <sql name="FIRST_NAME" type="char"/>
+        <field name="firstName" type="string" required="true">
+            <sql name="FIRST_NAME" type="varchar"/>
         </field>
-        <field name="lastName" type="string">
-            <sql name="LAST_NAME" type="char"/>
+        <field name="lastName" type="string" required="true">
+            <sql name="LAST_NAME" type="varchar"/>
         </field>
         <field name="books" type="ctf.jdo.tc8x.Lazy1to1Book" lazy="true" collection="collection">
             <sql many-key="ID"/>
@@ -253,8 +253,8 @@
         <field name="id" type="long">
             <sql name="ID" type="bigint"/>
         </field>
-        <field name="name" type="string">
-            <sql name="NAME" type="char"/>
+        <field name="name" type="string" required="true">
+            <sql name="NAME" type="varchar"/>
         </field>
         <field name="author" type="ctf.jdo.tc8x.Lazy1to1Author" required="true" lazy="true">
             <sql name="AUTHOR_ID"/>
@@ -350,7 +350,7 @@
         <field name="id" type="integer">
             <sql name="id" type="integer" />
         </field>
-        <field name="name" type="string">
+        <field name="name" type="string" required="true">
             <sql name="name" type="varchar" />
         </field>
         <field name="contract" type="ctf.jdo.tc8x.LazyContract" collection="collection" >
Index: src/test/resources/ctf/jdo/tc9x/mapping.xml
===================================================================
--- src/test/resources/ctf/jdo/tc9x/mapping.xml	(revision 6074)
+++ src/test/resources/ctf/jdo/tc9x/mapping.xml	(working copy)
@@ -9,10 +9,10 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
+    <field name="name" type="string" required="true">
       <sql name="name" type="char" />
     </field>
-    <field name="detail" type="ctf.jdo.tc9x.ProductDetail">
+    <field name="detail" type="ctf.jdo.tc9x.ProductDetail" required="true">
       <sql name="detail" />
     </field>
     <field name="owner" type="ctf.jdo.tc9x.Owner">
@@ -29,8 +29,8 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="cpu" type="string">
-      <sql name="cpu" type="char"/>
+    <field name="cpu" type="string" required="true">
+      <sql name="cpu" type="varchar"/>
     </field>
   </class>
 
@@ -40,11 +40,11 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="weight" type="integer">
+    <field name="weight" type="integer" required="true">
       <sql name="weight" type="integer"/>
     </field>
-    <field name="resolution" type="string">
-      <sql name="resolution" type="char"/>
+    <field name="resolution" type="string" required="true">
+      <sql name="resolution" type="varchar"/>
     </field>
   </class>
 
@@ -54,10 +54,10 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="numberOfCPUs" type="integer">
+    <field name="numberOfCPUs" type="integer" required="true">
       <sql name="numberOfCPUs" type="integer" />
     </field>
-    <field name="supportInYears" type="integer">
+    <field name="supportInYears" type="integer" required="true">
       <sql name="support" type="integer"/>
     </field>
   </class>
@@ -68,11 +68,11 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="kw" type="integer">
+    <field name="kw" type="integer" required="true">
       <sql name="kw" type="integer" />
     </field>
-    <field name="make" type="string">
-      <sql name="make" type="char"/>
+    <field name="make" type="string" required="true">
+      <sql name="make" type="varchar"/>
     </field>
   </class>
 
@@ -82,7 +82,7 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="maxWeight" type="integer">
+    <field name="maxWeight" type="integer" required="true">
       <sql name="max_weight" type="integer" />
     </field>
   </class>
@@ -96,8 +96,8 @@
     <field name="id2" type="integer">
       <sql name="id2" type="integer" />
     </field>
-    <field name="name" type="string">
-      <sql name="name" type="char" />
+    <field name="name" type="string" required="true">
+      <sql name="name" type="varchar" />
     </field>
 
   </class>
@@ -111,8 +111,8 @@
     <field name="id2" type="integer">
       <sql name="id2" type="integer" />
     </field>
-    <field name="cpu" type="string">
-      <sql name="cpu" type="char"/>
+    <field name="cpu" type="string" required="true">
+      <sql name="cpu" type="varchar"/>
     </field>
   </class>
 
@@ -125,11 +125,11 @@
     <field name="id2" type="integer">
       <sql name="id2" type="integer" />
     </field>
-    <field name="weight" type="integer">
+    <field name="weight" type="integer" required="true">
       <sql name="weight" type="integer"/>
     </field>
-    <field name="resolution" type="string">
-      <sql name="resolution" type="char"/>
+    <field name="resolution" type="string" required="true">
+      <sql name="resolution" type="varchar"/>
     </field>
   </class>
 
@@ -142,10 +142,10 @@
     <field name="id2" type="integer">
       <sql name="id2" type="integer" />
     </field>
-    <field name="numberOfCPUs" type="integer">
+    <field name="numberOfCPUs" type="integer" required="true">
       <sql name="numberOfCPUs" type="integer" />
     </field>
-    <field name="supportInYears" type="integer">
+    <field name="supportInYears" type="integer" required="true">
       <sql name="support" type="integer"/>
     </field>
   </class>
@@ -156,10 +156,10 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
+    <field name="name" type="string" required="true">
       <sql name="name" type="char" />
     </field>
-    <field name="product" type="ctf.jdo.tc9x.Product">
+    <field name="product" type="ctf.jdo.tc9x.Product" required="true">
       <sql name="product" />
     </field>
   </class>
@@ -170,11 +170,11 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="location" type="string">
-      <sql name="location" type="char" />
+    <field name="location" type="string" required="true">
+      <sql name="location" type="varchar" />
     </field>
-    <field name="category" type="string">
-      <sql name="category" type="char" />
+    <field name="category" type="string" required="true">
+      <sql name="category" type="varchar" />
     </field>
   </class>
 
@@ -184,8 +184,8 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
-      <sql name="name" type="char" />
+    <field name="name" type="string" required="true">
+      <sql name="name" type="varchar" />
     </field>
     <field name="products" type="ctf.jdo.tc9x.Product" collection="collection">
       <sql name="product_id" many-table="tc9x_poly_order_product" many-key="order_id" />
@@ -198,8 +198,8 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
-      <sql name="name" type="char" />
+    <field name="name" type="string" required="true">
+      <sql name="name" type="varchar" />
     </field>
     <field name="ns" type="ctf.jdo.tc9x.N" collection="collection">
       <sql name="n_id" many-table="tc9x_poly_m_n" many-key="m_id" />
@@ -212,8 +212,8 @@
     <field name="id" type="integer">
       <sql name="id" type="integer" />
     </field>
-    <field name="name" type="string">
-      <sql name="name" type="char" />
+    <field name="name" type="string" required="true">
+      <sql name="name" type="varchar" />
     </field>
     <field name="ms" type="ctf.jdo.tc9x.M" collection="collection">
       <sql name="m_id" many-table="tc9x_poly_m_n" many-key="n_id" />
@@ -225,14 +225,14 @@
     <field name="id" type="string">
       <sql name="id" type="varchar"/>
     </field>
-    <field name="color" type="string">
+    <field name="color" type="string" required="true">
       <sql name="color" type="varchar"/>
     </field>
   </class>
 
   <class name="ctf.jdo.tc9x.Derived" extends="ctf.jdo.tc9x.Base" >
     <map-to table="tc9x_poly_derived"/>
-    <field name="scent" type="string">
+    <field name="scent" type="string" required="true">
       <sql name="scent" type="varchar"/>
     </field>
   </class>
@@ -338,6 +338,9 @@
     <field name="name" type="string">
       <sql name="name" type="char" />
     </field>
+    <field name="owner" type="ctf.jdo.tc9x.Owner">
+    	<sql name="owner" />
+    </field>
     <field name="detail" type="ctf.jdo.tc9x.ProductDetail">
       <sql name="detail" />
     </field>
Index: src/tests/jdo/db2.sql
===================================================================
--- src/tests/jdo/db2.sql	(revision 6074)
+++ src/tests/jdo/db2.sql	(working copy)
@@ -79,7 +79,6 @@
   int_date       integer,
   str_time       char(23),
   num_date       numeric(17,0),
-  date_str       timestamp,
   long_date      numeric(20,0)
 );
 
@@ -91,7 +90,6 @@
   id        numeric(10,0)  not null,
   blob_val  blob,
   clob_val  clob,
-  blob_val2 blob,
   clob_val2 clob
 );
 
@@ -101,9 +99,6 @@
 
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int,
-    bool_short         int,
-    bool_short_minus   int,
     bool_int           int,
     bool_int_minus     int,
     bool_bigdec        numeric,
@@ -113,13 +108,9 @@
     long_int           int         ,
     double_int         int         ,
     float_int          float       ,
-    byte_bigdec        numeric     ,
-    short_bigdec       numeric     ,
     int_bigdec         numeric     ,
     float_bigdec       numeric     ,
     double_bigdec      numeric     ,
-    short_string       varchar(20) ,
-    byte_string        varchar(20) ,
     int_string         varchar(20) ,
     long_string        varchar(20) ,
     bigdec_string      varchar(20) ,
@@ -370,16 +361,6 @@
 
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table  tc2x_seqtable;
-
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity;
@@ -914,7 +895,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -970,7 +950,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -1103,7 +1082,6 @@
 drop table tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -1256,7 +1234,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table  tc9x_poly_computer_multi;
@@ -1397,13 +1374,13 @@
 
 DROP TABLE  tc9x_poly_Product;
 CREATE TABLE tc9x_poly_Product(
-  IdProd NUMERIC(10) not null PRIMARY KEY,
+  IdProd int not null PRIMARY KEY,
   NameProd   VARCHAR(30) default NULL,
   DescProd   VARCHAR(30) default NULL);
 
 DROP TABLE  tc9x_poly_ActProduct;
 CREATE TABLE tc9x_poly_ActProduct(
-  IdAct NUMERIC(10) not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
+  IdAct int not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
   BestSeason VARCHAR(30) default NULL);
 
 DROP TABLE  tc9x_poly_ComposedOffer;
@@ -1458,7 +1435,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 );
 
Index: src/tests/jdo/derby.sql
===================================================================
--- src/tests/jdo/derby.sql	(revision 6074)
+++ src/tests/jdo/derby.sql	(working copy)
@@ -81,7 +81,6 @@
   int_date       integer,
   str_time       char(23),
   num_date       numeric(17,0),
-  date_str       timestamp,
   long_date      numeric(20,0)
 );
 
@@ -93,7 +92,6 @@
   id        numeric(10,0)  not null,
   blob_val  blob,
   clob_val  clob,
-  blob_val2 blob,
   clob_val2 clob
 );
 
@@ -103,9 +101,6 @@
 
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int,
-    bool_short         int,
-    bool_short_minus   int,
     bool_int           int,
     bool_int_minus     int,
     bool_bigdec        numeric,
@@ -115,13 +110,9 @@
     long_int           int         ,
     double_int         int         ,
     float_int          float       ,
-    byte_bigdec        numeric     ,
-    short_bigdec       numeric     ,
     int_bigdec         numeric     ,
     float_bigdec       numeric     ,
     double_bigdec      numeric     ,
-    short_string       varchar(20) ,
-    byte_string        varchar(20) ,
     int_string         varchar(20) ,
     long_string        varchar(20) ,
     bigdec_string      varchar(20) ,
@@ -370,16 +361,6 @@
 
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table  tc2x_seqtable;
-
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity;
@@ -914,7 +895,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -969,7 +949,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -1113,7 +1092,6 @@
 drop table tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -1128,7 +1106,6 @@
 drop table tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -1284,7 +1261,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table  tc9x_poly_computer_multi;
@@ -1425,13 +1401,13 @@
 
 DROP TABLE  tc9x_poly_Product;
 CREATE TABLE tc9x_poly_Product(
-  IdProd NUMERIC(10) not null PRIMARY KEY,
+  IdProd int not null PRIMARY KEY,
   NameProd   VARCHAR(30) default NULL,
   DescProd   VARCHAR(30) default NULL);
 
 DROP TABLE  tc9x_poly_ActProduct;
 CREATE TABLE tc9x_poly_ActProduct(
-  IdAct NUMERIC(10) not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
+  IdAct int not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
   BestSeason VARCHAR(30) default NULL);
 
 DROP TABLE  tc9x_poly_ComposedOffer;
@@ -1453,7 +1429,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 );
 
@@ -1525,4 +1500,4 @@
   id          int		     	not null,  
   parent_id	  int				DEFAULT null
 );
-	
\ No newline at end of file
+	
Index: src/tests/jdo/hsql.sql
===================================================================
--- src/tests/jdo/hsql.sql	(revision 6074)
+++ src/tests/jdo/hsql.sql	(working copy)
@@ -79,7 +79,6 @@
   int_date        integer        null,
   str_time        char(23)       null,
   num_date        bigint         null,
-  date_str        datetime       null,
   long_date       numeric(20,0)  null
 );
 
@@ -91,7 +90,6 @@
   id        numeric(10,0)      not null,
   blob_val  longvarbinary      null,
   clob_val  longvarchar        null,
-  blob_val2 longvarbinary      null,
   clob_val2 longvarchar        null
 );
 
@@ -101,9 +99,6 @@
 
 create table tc1x_conv (
     id                 int          not null,
-    bool_byte          int          null,
-    bool_short         int          null,
-    bool_short_minus   int          null,
     bool_int           int          null,
     bool_int_minus     int          null,
     bool_bigdec        numeric      null,
@@ -113,13 +108,9 @@
     long_int           int          null,
     double_int         int          null,
     float_int          float        null,
-    byte_bigdec        numeric      null,
-    short_bigdec       numeric      null,
     int_bigdec         numeric      null,
     float_bigdec       numeric      null,
     double_bigdec      numeric      null,
-    short_string       varchar(20)  null,
-    byte_string        varchar(20)  null,
     int_string         varchar(20)  null,
     long_string        varchar(20)  null,
     bigdec_string      varchar(20)  null,
@@ -369,16 +360,7 @@
 
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table if exists tc2x_seqtable;
 
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc2x TESTS
 
 drop table if exists tc3x_entity;
@@ -685,7 +667,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -714,7 +695,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -786,7 +766,6 @@
 drop table tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -798,10 +777,9 @@
 
 -- tc8x
 
-drop tc7x_table self_refer_parent;
-create tc7x_table self_refer_parent (
+drop tc8x_table self_refer_parent;
+create tc8x_table self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -956,7 +934,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table if exists tc9x_poly_computer_multi;
@@ -1103,7 +1080,7 @@
 
 drop table if exists tc9x_poly_ActProduct;
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key,
+  IdAct int primary key,
   BestSeason varchar(30) null
 );
 
@@ -1158,7 +1135,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 );
 
@@ -1229,4 +1205,4 @@
 create table tc200_self_relation_folder_extend (
   id          int		     	not null,  
   parent_id	  int				null
-);
\ No newline at end of file
+);
Index: src/tests/jdo/mssql.sql
===================================================================
--- src/tests/jdo/mssql.sql	(revision 6074)
+++ src/tests/jdo/mssql.sql	(working copy)
@@ -97,7 +97,6 @@
   int_date       integer        null,
   str_time       char(23)       null,
   num_date       numeric(17,0)  null,
-  date_str       datetime       null,
   long_date      numeric(20,0)  null
 )
 go
@@ -112,7 +111,6 @@
   id        numeric(10,0)  not null,
   blob_val  image          null,
   clob_val  text           null,
-  blob_val2 image          null,
   clob_val2 text           null,
 )
 go
@@ -125,9 +123,6 @@
 go
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int         null,
-    bool_short         int         null,
-    bool_short_minus   int         null,
     bool_int           int         null,
     bool_int_minus     int         null,
     bool_bigdec        numeric     null,
@@ -137,13 +132,9 @@
     long_int           int         null,
     double_int         int         null,
     float_int          float       null,
-    byte_bigdec        numeric     null,
-    short_bigdec       numeric     null,
     int_bigdec         numeric     null,
     float_bigdec       numeric     null,
     double_bigdec      numeric     null,
-    short_string       varchar(20) null,
-    byte_string        varchar(20) null,
     int_string         varchar(20) null,
     long_string        varchar(20) null,
     bigdec_string      varchar(20) null,
@@ -472,19 +463,7 @@
 grant all on tc2x_identity_ext to test
 go
 
-drop table tc2x_seqtable
-go
-create table tc2x_seqtable (
-  table_name varchar(200) not null,
-  max_id     int          null
-)
-go
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name )
-go
-grant all on tc2x_seqtable to test
-go
 
-
 -- tc3x TESTS
 
 drop table tc3x_entity
@@ -906,7 +885,6 @@
 go
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 )
 go
 create unique index tc7x_col_pk on tc7x_col( id )
@@ -965,7 +943,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 go
 
@@ -1045,7 +1022,6 @@
 
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 )
 go
@@ -1071,7 +1047,6 @@
 go
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 )
 go
@@ -1274,7 +1249,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 )
 go
 
@@ -1485,7 +1459,7 @@
 drop table tc9x_poly_Product
 go
 create table tc9x_poly_Product(
-  IdProd numeric(10) primary key,
+  IdProd int primary key,
   NameProd   varchar(30) null,
   DescProd   varchar(30) null
 )
@@ -1494,7 +1468,7 @@
 drop table tc9x_poly_ActProduct
 go
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key references Product (IdProd),
+  IdAct int primary key references Product (IdProd),
   BestSeason varchar(30) null
 )
 go
@@ -1563,7 +1537,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 )
 go
@@ -1655,4 +1628,4 @@
   parent_id	  int				DEFAULT null
 )
 go
-	
\ No newline at end of file
+	
Index: src/tests/jdo/mysql.sql
===================================================================
--- src/tests/jdo/mysql.sql	(revision 6074)
+++ src/tests/jdo/mysql.sql	(working copy)
@@ -82,7 +82,6 @@
   int_date       integer        null,
   str_time       char(23)       null,
   num_date       bigint         null,
-  date_str       datetime       null,
   long_date      numeric(20,0)  null
 );
 
@@ -94,7 +93,6 @@
   id        numeric(10,0)  not null,
   blob_val  longblob           null,
   clob_val  longtext           null,
-  blob_val2 longblob           null,
   clob_val2 longtext           null
 );
 
@@ -104,9 +102,6 @@
 
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int         null,
-    bool_short         int         null,
-    bool_short_minus   int         null,
     bool_int           int         null,
     bool_int_minus     int         null,
     bool_bigdec        numeric     null,
@@ -116,13 +111,9 @@
     long_int           int         null,
     double_int         int         null,
     float_int          float       null,
-    byte_bigdec        numeric     null,
-    short_bigdec       numeric     null,
     int_bigdec         numeric     null,
     float_bigdec       numeric     null,
     double_bigdec      numeric     null,
-    short_string       varchar(20) null,
-    byte_string        varchar(20) null,
     int_string         varchar(20) null,
     long_string        varchar(20) null,
     bigdec_string      varchar(20) null,
@@ -371,16 +362,6 @@
 
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table if exists tc2x_seqtable;
-
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table if exists tc3x_entity;
@@ -508,7 +489,6 @@
 drop table if exists tc7x_col;
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 );
 create unique index tc7x_col_pk on tc7x_col( id );
 
@@ -553,7 +533,6 @@
 CREATE TABLE tc7x_container (
   id int(11) unsigned NOT NULL auto_increment,
   name varchar(200) NULL,
-  prop int(11) unsigned default NULL,
   PRIMARY KEY  (id)
 );
 
@@ -762,7 +741,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -865,7 +843,6 @@
 drop table if exists tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -881,7 +858,6 @@
 drop table if exists tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null primary key,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -1036,7 +1012,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table if exists tc9x_poly_computer_multi;
@@ -1182,13 +1157,13 @@
 
 DROP TABLE IF EXISTS tc9x_poly_Product;
 CREATE TABLE tc9x_poly_Product(
-  IdProd NUMERIC(10) PRIMARY KEY,
+  IdProd int PRIMARY KEY,
   NameProd   VARCHAR(30) NULL,
   DescProd   VARCHAR(30) NULL);
 
 DROP TABLE IF EXISTS tc9x_poly_ActProduct;
 CREATE TABLE tc9x_poly_ActProduct(
-  IdAct NUMERIC(10) PRIMARY KEY REFERENCES Product (IdProd),
+  IdAct int PRIMARY KEY REFERENCES Product (IdProd),
   BestSeason VARCHAR(30) NULL);
 
 DROP TABLE IF EXISTS tc9x_poly_ComposedOffer;
Index: src/tests/jdo/oracle.sql
===================================================================
--- src/tests/jdo/oracle.sql	(revision 6074)
+++ src/tests/jdo/oracle.sql	(working copy)
@@ -81,7 +81,6 @@
   int_date       integer        null,
   str_time       char(23)       null,
   num_date       numeric(17,0)  null,
-  date_str       date           null,
   long_date      numeric(20,0)  null
 );
 
@@ -93,7 +92,6 @@
   id        numeric(10,0)  not null,
   blob_val  blob           null,
   clob_val  clob           null,
-  blob_val2 blob           null,
   clob_val2 clob           null
 );
 
@@ -103,9 +101,6 @@
 
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int         null,
-    bool_short         int         null,
-    bool_short_minus   int         null,
     bool_int           int         null,
     bool_int_minus     int         null,
     bool_bigdec        numeric     null,
@@ -115,13 +110,9 @@
     long_int           int         null,
     double_int         int         null,
     float_int          float       null,
-    byte_bigdec        numeric     null,
-    short_bigdec       numeric     null,
     int_bigdec         numeric     null,
     float_bigdec       numeric     null,
     double_bigdec      numeric     null,
-    short_string       varchar(20) null,
-    byte_string        varchar(20) null,
     int_string         varchar(20) null,
     long_string        varchar(20) null,
     bigdec_string      varchar(20) null,
@@ -385,14 +376,7 @@
 
 drop table tc2x_seqtable;
 
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
 
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity;
@@ -509,20 +493,6 @@
 
 -- grant all on tc7x_table to test;
 
-
-drop table   test_table2;
-
-create table test_table2 (
-  id      int           not null,
-  value1  varchar(200)  not null,
-  value2  varchar(200)
-);
-
-create unique index test_table2_pk on test_table2 ( id );
-
--- grant all on test_table to test;
-
-
 -- test many to many
 
 drop table tc7x_group_person;
@@ -796,7 +766,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -853,7 +822,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -1003,7 +971,6 @@
 drop table tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -1018,7 +985,6 @@
 drop table tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -1171,7 +1137,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table tc9x_poly_computer_multi;
@@ -1312,13 +1277,13 @@
 
 drop table tc9x_poly_Product;
 create table tc9x_poly_Product(
-  IdProd numeric(10) primary key,
+  IdProd int primary key,
   NameProd   varchar(30) null,
   DescProd   varchar(30) null);
 
 drop table tc9x_poly_ActProduct;
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key,
+  IdAct int primary key,
   BestSeason varchar(30) null);
 
 drop table tc9x_poly_ComposedOffer;
@@ -1370,7 +1335,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 );
 
Index: src/tests/jdo/pointbase.sql
===================================================================
--- src/tests/jdo/pointbase.sql	(revision 6074)
+++ src/tests/jdo/pointbase.sql	(working copy)
@@ -79,7 +79,6 @@
   int_date       integer,
   str_time       char(23),
   num_date       numeric(17,0),
-  date_str       timestamp,
   long_date      numeric(20,0)
 );
 
@@ -91,7 +90,6 @@
   id        numeric(10,0)  not null,
   blob_val  blob,
   clob_val  clob,
-  blob_val2 blob,
   clob_val2 clob
 );
 
@@ -101,9 +99,6 @@
 
 create table tc1x_conv (
     id                 int         not null,
-    bool_byte          int,
-    bool_short         int,
-    bool_short_minus   int,
     bool_int           int,
     bool_int_minus     int,
     bool_bigdec        numeric,
@@ -113,13 +108,9 @@
     long_int           int         ,
     double_int         int         ,
     float_int          float       ,
-    byte_bigdec        numeric     ,
-    short_bigdec       numeric     ,
     int_bigdec         numeric     ,
     float_bigdec       numeric     ,
     double_bigdec      numeric     ,
-    short_string       varchar(20) ,
-    byte_string        varchar(20) ,
     int_string         varchar(20) ,
     long_string        varchar(20) ,
     bigdec_string      varchar(20) ,
@@ -367,16 +358,6 @@
 drop index tc2x_identity_ext.tc2x_ident_ext_pk;
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table  tc2x_seqtable;
-
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity;
@@ -916,7 +897,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -971,7 +951,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -1115,7 +1094,6 @@
 drop table tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -1130,7 +1108,6 @@
 drop table tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -1254,7 +1231,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table  tc9x_poly_computer_multi;
@@ -1395,13 +1371,13 @@
 
 DROP TABLE  tc9x_poly_Product;
 CREATE TABLE tc9x_poly_Product(
-  IdProd NUMERIC(10) not null PRIMARY KEY,
+  IdProd int not null PRIMARY KEY,
   NameProd   VARCHAR(30) NULL,
   DescProd   VARCHAR(30) NULL);
 
 DROP TABLE  tc9x_poly_ActProduct;
 CREATE TABLE tc9x_poly_ActProduct(
-  IdAct NUMERIC(10) not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
+  IdAct int not null PRIMARY KEY REFERENCES tc9x_poly_Product (IdProd),
   BestSeason VARCHAR(30) NULL);
 
 DROP TABLE  tc9x_poly_ComposedOffer;
@@ -1424,7 +1400,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int NULL,
   PRIMARY KEY (id)
 );
 
@@ -1496,4 +1471,4 @@
   id          int		     	not null,  
   parent_id	  int				null
 );
-	
\ No newline at end of file
+	
Index: src/tests/jdo/postgres.sql
===================================================================
--- src/tests/jdo/postgres.sql	(revision 6074)
+++ src/tests/jdo/postgres.sql	(working copy)
@@ -79,7 +79,6 @@
   int_date        integer                        null,
   str_time        varchar(40)                    null,
   num_date        numeric(17,0)                  null,
-  date_str        timestamp without time zone    null,
   long_date       numeric(20,0)                  null
 );
 
@@ -91,7 +90,6 @@
   id         numeric(10,0)  not null,
   blob_val   bytea          null,
   clob_val   text           null,
-  blob_val2  bytea          null,
   clob_val2  text           null
 );
 
@@ -101,9 +99,6 @@
 
 create table tc1x_conv (
     id                 int          not null,
-    bool_byte          int          null,
-    bool_short         int          null,
-    bool_short_minus   int          null,
     bool_int           int          null,
     bool_int_minus     int          null,
     bool_bigdec        numeric      null,
@@ -113,13 +108,9 @@
     long_int           int          null,
     double_int         int          null,
     float_int          float        null,
-    byte_bigdec        numeric      null,
-    short_bigdec       numeric      null,
     int_bigdec         numeric      null,
     float_bigdec       numeric      null,
     double_bigdec      numeric      null,
-    short_string       varchar(20)  null,
-    byte_string        varchar(20)  null,
     int_string         varchar(20)  null,
     long_string        varchar(20)  null,
     bigdec_string      varchar(20)  null,
@@ -384,16 +375,7 @@
 
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id );
 
-drop table tc2x_seqtable;
 
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-);
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name );
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity;
@@ -556,7 +538,6 @@
 
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 );
 
 create unique index tc7x_col_pk on tc7x_col( id );
@@ -585,7 +566,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 );
 
 create index test_oqltag_fk1 on test_oqltag( id1 );
@@ -816,7 +796,6 @@
 drop table tc8x_trans_child2;
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 );
 
@@ -831,7 +810,6 @@
 drop table tc8x_self_refer_parent;
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 );
 
@@ -986,7 +964,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 );
 
 drop table tc9x_poly_computer_multi;
@@ -1127,14 +1104,14 @@
 
 drop table tc9x_poly_Product;
 create table tc9x_poly_Product(
-  IdProd numeric(10) primary key,
+  IdProd int primary key,
   NameProd   varchar(30) null,
   DescProd   varchar(30) null
 );
 
 drop table tc9x_poly_ActProduct;
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key,
+  IdAct int primary key,
   BestSeason varchar(30) null
 );
 
@@ -1190,7 +1167,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL,
   name varchar(200) NULL,
-  prop int NULL,
   PRIMARY KEY (id)
 );
 
@@ -1260,4 +1236,4 @@
   id          int		     	not null,  
   parent_id	  int				null
 );
-	
\ No newline at end of file
+	
Index: src/tests/jdo/sapdb.sql
===================================================================
--- src/tests/jdo/sapdb.sql	(revision 6074)
+++ src/tests/jdo/sapdb.sql	(working copy)
@@ -99,7 +99,6 @@
   int_date        integer      null,
   str_time        char(24)     null,
   num_date        fixed(17,0)  null,
-  date_str        timestamp    null,
   long_date       fixed(20,0)  null
 )
 //
@@ -114,7 +113,6 @@
   id         fixed(10,0)    not null,
   blob_val   long byte      null,
   clob_val   long           null,
-  blob_val2  long byte      null,
   clob_val2  long           null
 )
 //
@@ -127,9 +125,6 @@
 
 create table tc1x_conv (
     id                 int          not null,
-    bool_byte          int          null,
-    bool_short         int          null,
-    bool_short_minus   int          null,
     bool_int           int          null,
     bool_int_minus     int          null,
     bool_bigdec        numeric      null,
@@ -139,13 +134,9 @@
     long_int           int          null,
     double_int         int          null,
     float_int          float        null,
-    byte_bigdec        numeric      null,
-    short_bigdec       numeric      null,
     int_bigdec         numeric      null,
     float_bigdec       numeric      null,
     double_bigdec      numeric      null,
-    short_string       varchar(20)  null,
-    byte_string        varchar(20)  null,
     int_string         varchar(20)  null,
     long_string        varchar(20)  null,
     bigdec_string      varchar(20)  null,
@@ -473,19 +464,7 @@
 create unique index tc2x_ident_ext_pk on tc2x_identity_ext ( id )
 //
 
-drop table tc2x_seqtable
-//
 
-create table tc2x_seqtable (
-  table_name  varchar(200)  not null,
-  max_id      int
-)
-//
-
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name )
-//
-
-
 -- tc3x TESTS
 
 drop table tc3x_entity
@@ -862,7 +841,6 @@
 
 create table tc7x_col (
   id     integer         not null,
-  dum    integer    null
 )
 //
 
@@ -897,7 +875,6 @@
 
 create table test_oqltag (
   id1   integer         not null,
-  id2   integer         not null
 )
 //
 
@@ -1014,7 +991,6 @@
 //
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 )
 //
@@ -1215,7 +1191,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 )
 //
 
@@ -1426,7 +1401,7 @@
 drop table tc9x_poly_Product
 //
 create table tc9x_poly_Product(
-  IdProd numeric(10) primary key,
+  IdProd int primary key,
   NameProd   varchar(30) null,
   DescProd   varchar(30) null
 )
@@ -1435,7 +1410,7 @@
 drop table tc9x_poly_ActProduct
 //
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key references tc9x_poly_Product (IdProd),
+  IdAct int primary key references tc9x_poly_Product (IdProd),
   BestSeason varchar(30) null
 )
 //
@@ -1505,7 +1480,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 )
 //
@@ -1598,4 +1572,4 @@
   parent_id	  int				null
 )
 //
-		
\ No newline at end of file
+		
Index: src/tests/jdo/sybase.sql
===================================================================
--- src/tests/jdo/sybase.sql	(revision 6074)
+++ src/tests/jdo/sybase.sql	(working copy)
@@ -97,7 +97,6 @@
   int_date        integer        null,
   str_time        char(23)       null,
   num_date        numeric(17,0)  null,
-  date_str        datetime       null,
   long_date       numeric(20,0)  null
 )
 go
@@ -112,7 +111,6 @@
   id         numeric(10,0)  not null,
   blob_val   image          null,
   clob_val   text           null,
-  blob_val2  image          null,
   clob_val2  text           null
 )
 go
@@ -125,9 +123,6 @@
 go
 create table tc1x_conv (
     id                 int          not null,
-    bool_byte          int          null,
-    bool_short         int          null,
-    bool_short_minus   int          null,
     bool_int           int          null,
     bool_int_minus     int          null,
     bool_bigdec        numeric      null,
@@ -137,13 +132,9 @@
     long_int           int          null,
     double_int         int          null,
     float_int          float        null,
-    byte_bigdec        numeric      null,
-    short_bigdec       numeric      null,
     int_bigdec         numeric      null,
     float_bigdec       numeric      null,
     double_bigdec      numeric      null,
-    short_string       varchar(20)  null,
-    byte_string        varchar(20)  null,
     int_string         varchar(20)  null,
     long_string        varchar(20)  null,
     bigdec_string      varchar(20)  null,
@@ -473,19 +464,7 @@
 grant all on tc2x_identity_ext to test
 go
 
-drop table tc2x_seqtable
-go
-create table tc2x_seqtable (
-  table_name varchar(200) not null,
-  max_id     int          null
-)
-go
-create unique index tc2x_seqtable_pk on tc2x_seqtable ( table_name )
-go
-grant all on tc2x_seqtable to test
-go
 
-
 -- tc3x TESTS
 
 drop table tc3x_entity
@@ -914,7 +893,6 @@
 go
 create table tc7x_col (
   id       integer         not null,
-  dum    integer    null
 )
 go
 create unique index tc7x_col_pk on tc7x_col( id )
@@ -1026,7 +1004,6 @@
 go
 create table tc8x_trans_child2 (
   id        int not null,
-  entityOneId int not null,
   descr     varchar(200) not null
 )
 go
@@ -1049,7 +1026,6 @@
 go
 create table tc8x_self_refer_parent (
   id        int not null,
-  fid		int,
   name      varchar(200) not null
 )
 go
@@ -1250,7 +1226,6 @@
   id1        int not null,
   id2        int not null,
   name      varchar(200) not null,
-  detail	int not null
 )
 go
 
@@ -1461,7 +1436,7 @@
 drop table tc9x_poly_Product
 go
 create table tc9x_poly_Product(
-  IdProd numeric(10) primary key,
+  IdProd int primary key,
   NameProd   varchar(30) null,
   DescProd   varchar(30) null
 )
@@ -1470,7 +1445,7 @@
 drop table tc9x_poly_ActProduct
 go
 create table tc9x_poly_ActProduct(
-  IdAct numeric(10) primary key references Product (IdProd),
+  IdAct int primary key references Product (IdProd),
   BestSeason varchar(30) null
 )
 go
@@ -1541,7 +1516,6 @@
 CREATE TABLE tc7x_container (
   id int NOT NULL ,
   name varchar(200) NULL,
-  prop int default NULL,
   PRIMARY KEY (id)
 )
 go
@@ -1633,4 +1607,4 @@
   parent_id	  int				DEFAULT null
 )
 go
-	
\ No newline at end of file
+