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 an...@apache.org on 2007/11/06 10:06:03 UTC
svn commit: r592343 - in
/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes:
ArrayListCollections-standard.orm MapStringKeyCollections-standard.orm
MapStringValueCollections-standard.orm
Author: andyj
Date: Tue Nov 6 01:06:03 2007
New Revision: 592343
URL: http://svn.apache.org/viewvc?rev=592343&view=rev
Log:
Fix use of jdbc-type to be in <column> under <element>, <key>, <value>
Modified:
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/MapStringKeyCollections-standard.orm
db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections-standard.orm
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=592343&r1=592342&r2=592343&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 Tue Nov 6 01:06:03 2007
@@ -258,15 +258,17 @@
<field name="ArrayListOfSimpleEnum45"
table="ARRAYLIST_OF_SIMPLEENUM45">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <element>
+ <column name="SIMPLEENUMVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleEnum46"
table="ARRAYLIST_OF_SIMPLEENUM46">
<join column="IDENTIFIER"/>
- <element column="SIMPLEENUMVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <element>
+ <column name="SIMPLEENUMVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </element>
<order column="INDEX"/>
</field>
</class>
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=592343&r1=592342&r2=592343&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 Tue Nov 6 01:06:03 2007
@@ -642,43 +642,49 @@
table="MAP_OF_STRING_SIMPLEENUM133">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</field>
<field name="MapOfString_SimpleEnum134"
table="MAP_OF_STRING_SIMPLEENUM134">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</field>
<field name="MapOfString_SimpleEnum135"
table="MAP_OF_STRING_SIMPLEENUM135">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</field>
<field name="MapOfString_SimpleEnum136"
table="MAP_OF_STRING_SIMPLEENUM136">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</field>
<field name="MapOfString_SimpleEnum137"
table="MAP_OF_STRING_SIMPLEENUM137">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</field>
<field name="MapOfString_SimpleEnum138"
table="MAP_OF_STRING_SIMPLEENUM138">
<join column="IDENTIFIER"/>
<key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <value>
+ <column name="VALUEVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </value>
</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=592343&r1=592342&r2=592343&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 Tue Nov 6 01:06:03 2007
@@ -555,39 +555,45 @@
</field>
<field name="MapOfSimpleEnum_String124" table="MAP_SIMPLEENUM124_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
<field name="MapOfSimpleEnum_String125" table="MAP_SIMPLEENUM125_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
<field name="MapOfSimpleEnum_String126" table="MAP_SIMPLEENUM126_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
<field name="MapOfSimpleEnum_String127" table="MAP_SIMPLEENUM127_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
<field name="MapOfSimpleEnum_String128" table="MAP_SIMPLEENUM128_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
<field name="MapOfSimpleEnum_String129" table="MAP_SIMPLEENUM129_STR">
<join column="IDENTIFIER"/>
- <key column="KEYVAL"/>
- <value column="VALUEVAL"
- jdbc-type="NUMERIC" length="2" scale="0"/>
+ <key>
+ <column name="KEYVAL" jdbc-type="NUMERIC" length="2" scale="0"/>
+ </key>
+ <value column="VALUEVAL"/>
</field>
</class>
</package>