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 2007/11/06 00:53:45 UTC
svn commit: r592194 - in /db/jdo/trunk/tck2/src:
orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
sql/derby/applicationidentity/
Author: mcaisse
Date: Mon Nov 5 15:53:44 2007
New Revision: 592194
URL: http://svn.apache.org/viewvc?rev=592194&view=rev
Log: (empty)
Modified:
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql
Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -131,7 +131,8 @@
</field>
<field name="ArrayOfSimpleEnum30" table="ARRAY_OF_SIMPLE_ENUM30">
<join column="IDENTIFIER"/>
- <element column="ENUMVAL"/>
+ <element column="ENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="ORDER_COL"/>
</field>
</class>
Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -258,13 +258,15 @@
<field name="ArrayListOfSimpleEnum45"
table="ARRAYLIST_OF_SIMPLEENUM45">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"/>
+ <element column="SIMPLEENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleEnum46"
table="ARRAYLIST_OF_SIMPLEENUM46">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"/>
+ <element column="SIMPLEENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="INDEX"/>
</field>
</class>
Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm Mon Nov 5 15:53:44 2007
@@ -21,79 +21,225 @@
http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
<package name="org.apache.jdo.tck.pc.fieldtypes">
<class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
- <field name="identifier" column="IDENTIFIER"/>
- <field name="SimpleEnum0" column="ENUM0"/>
- <field name="SimpleEnum1" column="ENUM1"/>
- <field name="SimpleEnum102" column="ENUM102"/>
- <field name="SimpleEnum103" column="ENUM103"/>
- <field name="SimpleEnum104" column="ENUM104"/>
- <field name="SimpleEnum108" column="ENUM108"/>
- <field name="SimpleEnum109" column="ENUM109"/>
- <field name="SimpleEnum11" column="ENUM11"/>
- <field name="SimpleEnum110" column="ENUM110"/>
- <field name="SimpleEnum112" column="ENUM112"/>
- <field name="SimpleEnum113" column="ENUM113"/>
- <field name="SimpleEnum114" column="ENUM114"/>
- <field name="SimpleEnum119" column="ENUM119"/>
- <field name="SimpleEnum12" column="ENUM12"/>
- <field name="SimpleEnum120" column="ENUM120"/>
- <field name="SimpleEnum121" column="ENUM121"/>
- <field name="SimpleEnum124" column="ENUM124"/>
- <field name="SimpleEnum125" column="ENUM125"/>
- <field name="SimpleEnum126" column="ENUM126"/>
- <field name="SimpleEnum128" column="ENUM128"/>
- <field name="SimpleEnum129" column="ENUM129"/>
- <field name="SimpleEnum13" column="ENUM13"/>
- <field name="SimpleEnum130" column="ENUM130"/>
- <field name="SimpleEnum138" column="ENUM138"/>
- <field name="SimpleEnum139" column="ENUM139"/>
- <field name="SimpleEnum140" column="ENUM140"/>
- <field name="SimpleEnum16" column="ENUM16"/>
- <field name="SimpleEnum17" column="ENUM17"/>
- <field name="SimpleEnum18" column="ENUM18"/>
- <field name="SimpleEnum2" column="ENUM2"/>
- <field name="SimpleEnum20" column="ENUM20"/>
- <field name="SimpleEnum21" column="ENUM21"/>
- <field name="SimpleEnum22" column="ENUM22"/>
- <field name="SimpleEnum30" column="ENUM30"/>
- <field name="SimpleEnum31" column="ENUM31"/>
- <field name="SimpleEnum32" column="ENUM32"/>
- <field name="SimpleEnum36" column="ENUM36"/>
- <field name="SimpleEnum37" column="ENUM37"/>
- <field name="SimpleEnum38" column="ENUM38"/>
- <field name="SimpleEnum4" column="ENUM4"/>
- <field name="SimpleEnum40" column="ENUM40"/>
- <field name="SimpleEnum41" column="ENUM41"/>
- <field name="SimpleEnum42" column="ENUM42"/>
- <field name="SimpleEnum47" column="ENUM47"/>
- <field name="SimpleEnum48" column="ENUM48"/>
- <field name="SimpleEnum49" column="ENUM49"/>
- <field name="SimpleEnum5" column="ENUM5"/>
- <field name="SimpleEnum52" column="ENUM52"/>
- <field name="SimpleEnum53" column="ENUM53"/>
- <field name="SimpleEnum54" column="ENUM54"/>
- <field name="SimpleEnum56" column="ENUM56"/>
- <field name="SimpleEnum57" column="ENUM57"/>
- <field name="SimpleEnum58" column="ENUM58"/>
- <field name="SimpleEnum6" column="ENUM6"/>
- <field name="SimpleEnum66" column="ENUM66"/>
- <field name="SimpleEnum67" column="ENUM67"/>
- <field name="SimpleEnum68" column="ENUM68"/>
- <field name="SimpleEnum72" column="ENUM72"/>
- <field name="SimpleEnum73" column="ENUM73"/>
- <field name="SimpleEnum74" column="ENUM74"/>
- <field name="SimpleEnum76" column="ENUM76"/>
- <field name="SimpleEnum77" column="ENUM77"/>
- <field name="SimpleEnum78" column="ENUM78"/>
- <field name="SimpleEnum83" column="ENUM83"/>
- <field name="SimpleEnum84" column="ENUM84"/>
- <field name="SimpleEnum85" column="ENUM85"/>
- <field name="SimpleEnum88" column="ENUM88"/>
- <field name="SimpleEnum89" column="ENUM89"/>
- <field name="SimpleEnum90" column="ENUM90"/>
- <field name="SimpleEnum92" column="ENUM92"/>
- <field name="SimpleEnum93" column="ENUM93"/>
- <field name="SimpleEnum94" column="ENUM94"/>
+ <field name="identifier">
+ <column name="IDENTIFIER"/>
+ </field>
+ <field name="SimpleEnum0">
+ <column name="ENUM0" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum1">
+ <column name="ENUM1" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum102">
+ <column name="ENUM102" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum103">
+ <column name="ENUM103" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum104">
+ <column name="ENUM104" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum108">
+ <column name="ENUM108" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum109">
+ <column name="ENUM109" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum11">
+ <column name="ENUM11" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum110">
+ <column name="ENUM110" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum112">
+ <column name="ENUM112" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum113">
+ <column name="ENUM113" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum114">
+ <column name="ENUM114" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum119">
+ <column name="ENUM119" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum12">
+ <column name="ENUM12" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum120">
+ <column name="ENUM120" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum121">
+ <column name="ENUM121" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum124">
+ <column name="ENUM124" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum125">
+ <column name="ENUM125" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum126">
+ <column name="ENUM126" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum128">
+ <column name="ENUM128" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum129">
+ <column name="ENUM129" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum13">
+ <column name="ENUM13" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum130">
+ <column name="ENUM130" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum138">
+ <column name="ENUM138" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum139">
+ <column name="ENUM139" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum140">
+ <column name="ENUM140" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum16">
+ <column name="ENUM16" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum17">
+ <column name="ENUM17" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum18">
+ <column name="ENUM18" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum2">
+ <column name="ENUM2" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum20">
+ <column name="ENUM20" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum21">
+ <column name="ENUM21" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum22">
+ <column name="ENUM22" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum30">
+ <column name="ENUM30" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum31">
+ <column name="ENUM31" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum32">
+ <column name="ENUM32" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum36">
+ <column name="ENUM36" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum37">
+ <column name="ENUM37" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum38">
+ <column name="ENUM38" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum4">
+ <column name="ENUM4" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum40">
+ <column name="ENUM40" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum41">
+ <column name="ENUM41" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum42">
+ <column name="ENUM42" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum47">
+ <column name="ENUM47" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum48">
+ <column name="ENUM48" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum49">
+ <column name="ENUM49" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum5">
+ <column name="ENUM5" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum52">
+ <column name="ENUM52" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum53">
+ <column name="ENUM53" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum54">
+ <column name="ENUM54" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum56">
+ <column name="ENUM56" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum57">
+ <column name="ENUM57" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum58">
+ <column name="ENUM58" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum6">
+ <column name="ENUM6" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum66">
+ <column name="ENUM66" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum67">
+ <column name="ENUM67" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum68">
+ <column name="ENUM68" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum72">
+ <column name="ENUM72" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum73">
+ <column name="ENUM73" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum74">
+ <column name="ENUM74" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum76">
+ <column name="ENUM76" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum77">
+ <column name="ENUM77" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum78">
+ <column name="ENUM78" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum83">
+ <column name="ENUM83" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum84">
+ <column name="ENUM84" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum85">
+ <column name="ENUM85" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum88">
+ <column name="ENUM88" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum89">
+ <column name="ENUM89" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum90">
+ <column name="ENUM90" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum92">
+ <column name="ENUM92" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum93">
+ <column name="ENUM93" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum94">
+ <column name="ENUM94" jdbc-type="INTEGER"/>
+ </field>
</class>
</package>
</orm>
Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -642,37 +642,43 @@
table="MAP_OF_STRING_SIMPLEENUM133">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum134"
table="MAP_OF_STRING_SIMPLEENUM134">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum135"
table="MAP_OF_STRING_SIMPLEENUM135">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum136"
table="MAP_OF_STRING_SIMPLEENUM136">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum137"
table="MAP_OF_STRING_SIMPLEENUM137">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum138"
table="MAP_OF_STRING_SIMPLEENUM138">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
</class>
</package>
Modified: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -556,32 +556,38 @@
<field name="MapOfSimpleEnum_String124" table="MAP_SIMPLEENUM124_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String125" table="MAP_SIMPLEENUM125_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String126" table="MAP_SIMPLEENUM126_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String127" table="MAP_SIMPLEENUM127_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String128" table="MAP_SIMPLEENUM128_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String129" table="MAP_SIMPLEENUM129_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
</class>
</package>
Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -133,7 +133,8 @@
</field>
<field name="ArrayOfSimpleEnum30" table="ARRAY_OF_SIMPLE_ENUM30">
<join column="IDENTIFIER"/>
- <element column="ENUMVAL"/>
+ <element column="ENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="ORDER_COL"/>
</field>
</class>
Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -229,13 +229,15 @@
<field name="ArrayListOfSimpleEnum45"
table="ARRAYLIST_OF_SIMPLEENUM45">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"/>
+ <element column="SIMPLEENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleEnum46"
table="ARRAYLIST_OF_SIMPLEENUM46">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"/>
+ <element column="SIMPLEENUMVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
<order column="INDEX"/>
</field>
</class>
Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm Mon Nov 5 15:53:44 2007
@@ -23,78 +23,222 @@
<class name="FieldsOfSimpleEnum" table="FIELDSOFENUMORDINAL">
<datastore-identity strategy="identity" column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="SimpleEnum0" column="ENUM0"/>
- <field name="SimpleEnum1" column="ENUM1"/>
- <field name="SimpleEnum102" column="ENUM102"/>
- <field name="SimpleEnum103" column="ENUM103"/>
- <field name="SimpleEnum104" column="ENUM104"/>
- <field name="SimpleEnum108" column="ENUM108"/>
- <field name="SimpleEnum109" column="ENUM109"/>
- <field name="SimpleEnum11" column="ENUM11"/>
- <field name="SimpleEnum110" column="ENUM110"/>
- <field name="SimpleEnum112" column="ENUM112"/>
- <field name="SimpleEnum113" column="ENUM113"/>
- <field name="SimpleEnum114" column="ENUM114"/>
- <field name="SimpleEnum119" column="ENUM119"/>
- <field name="SimpleEnum12" column="ENUM12"/>
- <field name="SimpleEnum120" column="ENUM120"/>
- <field name="SimpleEnum121" column="ENUM121"/>
- <field name="SimpleEnum124" column="ENUM124"/>
- <field name="SimpleEnum125" column="ENUM125"/>
- <field name="SimpleEnum126" column="ENUM126"/>
- <field name="SimpleEnum128" column="ENUM128"/>
- <field name="SimpleEnum129" column="ENUM129"/>
- <field name="SimpleEnum13" column="ENUM13"/>
- <field name="SimpleEnum130" column="ENUM130"/>
- <field name="SimpleEnum138" column="ENUM138"/>
- <field name="SimpleEnum139" column="ENUM139"/>
- <field name="SimpleEnum140" column="ENUM140"/>
- <field name="SimpleEnum16" column="ENUM16"/>
- <field name="SimpleEnum17" column="ENUM17"/>
- <field name="SimpleEnum18" column="ENUM18"/>
- <field name="SimpleEnum2" column="ENUM2"/>
- <field name="SimpleEnum20" column="ENUM20"/>
- <field name="SimpleEnum21" column="ENUM21"/>
- <field name="SimpleEnum22" column="ENUM22"/>
- <field name="SimpleEnum30" column="ENUM30"/>
- <field name="SimpleEnum31" column="ENUM31"/>
- <field name="SimpleEnum32" column="ENUM32"/>
- <field name="SimpleEnum36" column="ENUM36"/>
- <field name="SimpleEnum37" column="ENUM37"/>
- <field name="SimpleEnum38" column="ENUM38"/>
- <field name="SimpleEnum4" column="ENUM4"/>
- <field name="SimpleEnum40" column="ENUM40"/>
- <field name="SimpleEnum41" column="ENUM41"/>
- <field name="SimpleEnum42" column="ENUM42"/>
- <field name="SimpleEnum47" column="ENUM47"/>
- <field name="SimpleEnum48" column="ENUM48"/>
- <field name="SimpleEnum49" column="ENUM49"/>
- <field name="SimpleEnum5" column="ENUM5"/>
- <field name="SimpleEnum52" column="ENUM52"/>
- <field name="SimpleEnum53" column="ENUM53"/>
- <field name="SimpleEnum54" column="ENUM54"/>
- <field name="SimpleEnum56" column="ENUM56"/>
- <field name="SimpleEnum57" column="ENUM57"/>
- <field name="SimpleEnum58" column="ENUM58"/>
- <field name="SimpleEnum6" column="ENUM6"/>
- <field name="SimpleEnum66" column="ENUM66"/>
- <field name="SimpleEnum67" column="ENUM67"/>
- <field name="SimpleEnum68" column="ENUM68"/>
- <field name="SimpleEnum72" column="ENUM72"/>
- <field name="SimpleEnum73" column="ENUM73"/>
- <field name="SimpleEnum74" column="ENUM74"/>
- <field name="SimpleEnum76" column="ENUM76"/>
- <field name="SimpleEnum77" column="ENUM77"/>
- <field name="SimpleEnum78" column="ENUM78"/>
- <field name="SimpleEnum83" column="ENUM83"/>
- <field name="SimpleEnum84" column="ENUM84"/>
- <field name="SimpleEnum85" column="ENUM85"/>
- <field name="SimpleEnum88" column="ENUM88"/>
- <field name="SimpleEnum89" column="ENUM89"/>
- <field name="SimpleEnum90" column="ENUM90"/>
- <field name="SimpleEnum92" column="ENUM92"/>
- <field name="SimpleEnum93" column="ENUM93"/>
- <field name="SimpleEnum94" column="ENUM94"/>
+ <field name="SimpleEnum0">
+ <column name="ENUM0" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum1">
+ <column name="ENUM1" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum102">
+ <column name="ENUM102" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum103">
+ <column name="ENUM103" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum104">
+ <column name="ENUM104" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum108">
+ <column name="ENUM108" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum109">
+ <column name="ENUM109" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum11">
+ <column name="ENUM11" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum110">
+ <column name="ENUM110" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum112">
+ <column name="ENUM112" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum113">
+ <column name="ENUM113" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum114">
+ <column name="ENUM114" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum119">
+ <column name="ENUM119" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum12">
+ <column name="ENUM12" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum120">
+ <column name="ENUM120" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum121">
+ <column name="ENUM121" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum124">
+ <column name="ENUM124" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum125">
+ <column name="ENUM125" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum126">
+ <column name="ENUM126" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum128">
+ <column name="ENUM128" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum129">
+ <column name="ENUM129" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum13">
+ <column name="ENUM13" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum130">
+ <column name="ENUM130" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum138">
+ <column name="ENUM138" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum139">
+ <column name="ENUM139" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum140">
+ <column name="ENUM140" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum16">
+ <column name="ENUM16" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum17">
+ <column name="ENUM17" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum18">
+ <column name="ENUM18" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum2">
+ <column name="ENUM2" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum20">
+ <column name="ENUM20" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum21">
+ <column name="ENUM21" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum22">
+ <column name="ENUM22" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum30">
+ <column name="ENUM30" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum31">
+ <column name="ENUM31" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum32">
+ <column name="ENUM32" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum36">
+ <column name="ENUM36" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum37">
+ <column name="ENUM37" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum38">
+ <column name="ENUM38" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum4">
+ <column name="ENUM4" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum40">
+ <column name="ENUM40" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum41">
+ <column name="ENUM41" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum42">
+ <column name="ENUM42" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum47">
+ <column name="ENUM47" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum48">
+ <column name="ENUM48" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum49">
+ <column name="ENUM49" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum5">
+ <column name="ENUM5" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum52">
+ <column name="ENUM52" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum53">
+ <column name="ENUM53" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum54">
+ <column name="ENUM54" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum56">
+ <column name="ENUM56" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum57">
+ <column name="ENUM57" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum58">
+ <column name="ENUM58" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum6">
+ <column name="ENUM6" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum66">
+ <column name="ENUM66" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum67">
+ <column name="ENUM67" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum68">
+ <column name="ENUM68" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum72">
+ <column name="ENUM72" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum73">
+ <column name="ENUM73" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum74">
+ <column name="ENUM74" jdbc-type="BIGINT"/>
+ </field>
+ <field name="SimpleEnum76">
+ <column name="ENUM76" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum77">
+ <column name="ENUM77" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum78">
+ <column name="ENUM78" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum83">
+ <column name="ENUM83" jdbc-type="NUMERIC"/>
+ </field>
+ <field name="SimpleEnum84">
+ <column name="ENUM84" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum85">
+ <column name="ENUM85" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum88">
+ <column name="ENUM88" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum89">
+ <column name="ENUM89" jdbc-type="SMALLINT"/>
+ </field>
+ <field name="SimpleEnum90">
+ <column name="ENUM90" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum92">
+ <column name="ENUM92" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum93">
+ <column name="ENUM93" jdbc-type="INTEGER"/>
+ </field>
+ <field name="SimpleEnum94">
+ <column name="ENUM94" jdbc-type="INTEGER"/>
+ </field>
</class>
</package>
</orm>
Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -644,37 +644,43 @@
table="MAP_OF_STRING_SIMPLEENUM133">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL
+ jdbc-type="NUMERIC" length="2" scale="0""/>
</field>
<field name="MapOfString_SimpleEnum134"
table="MAP_OF_STRING_SIMPLEENUM134">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL
+ jdbc-type="NUMERIC" length="2" scale="0""/>
</field>
<field name="MapOfString_SimpleEnum135"
table="MAP_OF_STRING_SIMPLEENUM135">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum136"
table="MAP_OF_STRING_SIMPLEENUM136">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum137"
table="MAP_OF_STRING_SIMPLEENUM137">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfString_SimpleEnum138"
table="MAP_OF_STRING_SIMPLEENUM138">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
</class>
</package>
Modified: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm (original)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm Mon Nov 5 15:53:44 2007
@@ -603,32 +603,38 @@
<field name="MapOfSimpleEnum_String124" table="MAP_SIMPLEENUM124_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String125" table="MAP_SIMPLEENUM125_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String126" table="MAP_SIMPLEENUM126_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String127" table="MAP_SIMPLEENUM127_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String128" table="MAP_SIMPLEENUM128_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
<field name="MapOfSimpleEnum_String129" table="MAP_SIMPLEENUM129_STR">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"/>
+ <value column="VALUEVAL"
+ jdbc-type="NUMERIC" length="2" scale="0"/>
</field>
</class>
</package>
Modified: db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql?rev=592194&r1=592193&r2=592194&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql Mon Nov 5 15:53:44 2007
@@ -6050,7 +6050,7 @@
(
IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
KEYVAL VARCHAR(100) NOT NULL,
- VALUEVAL INTEGER NOT NULL
+ VALUEVAL NUMERIC(2,0) NOT NULL
);
CREATE TABLE MAP_OF_STRING_SIMPLEENUM137