db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcai...@apache.org
Subject svn commit: r591430 [2/3] - in /db/jdo/trunk/tck2/src: conf/ java/org/apache/jdo/tck/models/fieldtypes/ java/org/apache/jdo/tck/pc/fieldtypes/ jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldty...
Date Fri, 02 Nov 2007 19:30:52 GMT
Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo?rev=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo Fri Nov  2 12:30:50 2007
@@ -139,6 +139,18 @@
 <array embedded-element="true">
 </array>
 </field>
+<field name="ArrayOfSimpleEnum28" serialized="true">
+<array embedded-element="false">
+</array>
+</field>
+<field name="ArrayOfSimpleEnum29" >
+<array embedded-element="true">
+</array>
+</field>
+<field name="ArrayOfSimpleEnum30" >
+<array embedded-element="true">
+</array>
+</field>
 </class>
 </package>
 </jdo>

Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo?rev=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections.jdo Fri Nov  2 12:30:50 2007
@@ -189,6 +189,29 @@
 <collection element-type="java.lang.Short" embedded-element="false">
 </collection>
 </field>
+<field name="ArrayListOfSimpleEnum42" >
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleEnum">
+</collection>
+</field>
+<field name="ArrayListOfSimpleEnum43" >
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleEnum"
+        embedded-element="true">
+</collection>
+</field>
+<field name="ArrayListOfSimpleEnum44" >
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleEnum"
+           embedded-element="false">
+</collection>
+</field>
+<field name="ArrayListOfSimpleEnum45" >
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleEnum">
+</collection>
+</field>
+<field name="ArrayListOfSimpleEnum46" >
+<collection element-type="org.apache.jdo.tck.pc.fieldtypes.SimpleEnum"
+           embedded-element="false">
+</collection>
+</field>
 </class>
 </package>
 </jdo>

Added: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo?rev=591430&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo (added)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo Fri Nov  2 12:30:50 2007
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<jdo xmlns="http://java.sun.com/xml/ns/jdo/jdo"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/jdo 
+	http://java.sun.com/xml/ns/jdo/jdo_2_1.xsd">
+<package name="org.apache.jdo.tck.pc.fieldtypes">
+<class name="FieldsOfSimpleEnum" identity-type="datastore">
+<field name="identifier"  persistence-modifier="none"/>
+<field name="SimpleEnum1"  embedded="true">
+</field>
+<field name="SimpleEnum2"  embedded="false">
+</field>
+<field name="SimpleEnum3" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum4" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum5" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum6" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum7" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum10" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum11" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum12" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum13" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum14" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum17"  embedded="true">
+</field>
+<field name="SimpleEnum18"  embedded="false">
+</field>
+<field name="SimpleEnum19" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum20" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum21" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum22" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum23" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum29" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum30" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum31" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum32" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum33" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum37"  embedded="true">
+</field>
+<field name="SimpleEnum38"  embedded="false">
+</field>
+<field name="SimpleEnum39" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum40" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum41" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum42" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum43" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum46" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum47" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum48" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum49" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum50" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum53"  embedded="true">
+</field>
+<field name="SimpleEnum54"  embedded="false">
+</field>
+<field name="SimpleEnum55" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum56" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum57" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum58" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum59" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum65" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum66" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum67" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum68" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum69" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum73"  embedded="true">
+</field>
+<field name="SimpleEnum74"  embedded="false">
+</field>
+<field name="SimpleEnum75" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum76" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum77" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum78" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum79" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum82" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum83" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum84" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum85" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum86" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum89"  embedded="true">
+</field>
+<field name="SimpleEnum90"  embedded="false">
+</field>
+<field name="SimpleEnum91" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum92" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum93" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum94" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum95" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum101" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum102" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum103" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum104" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum105" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum109"  embedded="true">
+</field>
+<field name="SimpleEnum110"  embedded="false">
+</field>
+<field name="SimpleEnum111" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum112" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum113" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum114" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum115" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum118" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum119" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum120" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum121" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum122" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum125"  embedded="true">
+</field>
+<field name="SimpleEnum126"  embedded="false">
+</field>
+<field name="SimpleEnum127" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum128" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum129" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum130" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum131" persistence-modifier="transactional" >
+</field>
+<field name="SimpleEnum137" persistence-modifier="none" >
+</field>
+<field name="SimpleEnum138" persistence-modifier="persistent" >
+</field>
+<field name="SimpleEnum139" persistence-modifier="persistent" embedded="true">
+</field>
+<field name="SimpleEnum140" persistence-modifier="persistent" embedded="false">
+</field>
+<field name="SimpleEnum141" persistence-modifier="transactional" >
+</field>
+</class>
+</package>
+</jdo>

Propchange: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum.jdo
------------------------------------------------------------------------------
    svn:eol-style = LF

Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo?rev=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringKeyCollections.jdo Fri Nov  2 12:30:50 2007
@@ -450,6 +450,62 @@
 <map key-type="String" value-type="Short" >
 </map>
 </field>
+<field name="MapOfString_SimpleEnum126" >
+<map key-type="String" value-type="SimpleEnum"
+     embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum127" >
+<map key-type="String" value-type="SimpleEnum" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum128" >
+<map key-type="String" value-type="SimpleEnum">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum129" >
+<map key-type="String" value-type="SimpleEnum"
+     embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum130" >
+<map key-type="String" value-type="SimpleEnum" embedded-key="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum131" >
+<map key-type="String" value-type="SimpleEnum">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum132" serialized="true">
+<map key-type="String" value-type="SimpleEnum" >
+</map>
+</field>
+<field name="MapOfString_SimpleEnum133" >
+<map key-type="String" value-type="SimpleEnum"
+     embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum134" >
+<map key-type="String" value-type="SimpleEnum" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum135" >
+<map key-type="String" value-type="SimpleEnum">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum136" >
+<map key-type="String" value-type="SimpleEnum"
+     embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum137" >
+<map key-type="String" value-type="SimpleEnum" embedded-key="true">
+</map>
+</field>
+<field name="MapOfString_SimpleEnum138" >
+<map key-type="String" value-type="SimpleEnum">
+</map>
+</field>
 </class>
 </package>
 </jdo>

Modified: db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo?rev=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo (original)
+++ db/jdo/trunk/tck2/src/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/MapStringValueCollections.jdo Fri Nov  2 12:30:50 2007
@@ -414,6 +414,62 @@
 <map  key-type="Short" value-type="String">
 </map>
 </field>
+<field name="MapOfSimpleEnum_String117" >
+<map  key-type="SimpleEnum" value-type="String">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String118" >
+<map  key-type="SimpleEnum" value-type="String"
+      embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String119" >
+<map  key-type="SimpleEnum" value-type="String" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String120" >
+<map  key-type="SimpleEnum" value-type="String">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String121" >
+<map  key-type="SimpleEnum" value-type="String"
+      embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String122" >
+<map  key-type="SimpleEnum" value-type="String" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String123" serialized="true">
+<map  key-type="SimpleEnum" value-type="String">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String124" >
+<map  key-type="SimpleEnum" value-type="String">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String125" >
+<map  key-type="SimpleEnum" value-type="String"
+      embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String126" >
+<map  key-type="SimpleEnum" value-type="String" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String127" >
+<map  key-type="SimpleEnum" value-type="String">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String128" >
+<map  key-type="SimpleEnum" value-type="String"
+      embedded-key="true" embedded-value="true">
+</map>
+</field>
+<field name="MapOfSimpleEnum_String129" >
+<map  key-type="SimpleEnum" value-type="String" embedded-value="true">
+</map>
+</field>
 </class>
 </package>
 </jdo>

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -123,6 +123,17 @@
                 <element column="SHORTVAL"/>
                 <order column="ORDER_COL"/>
             </field>
+            <field name="ArrayOfSimpleEnum28" column="ARRAY_OF_SIMPLE_ENUM28"/>
+            <field name="ArrayOfSimpleEnum29" table="ARRAY_OF_SIMPLE_ENUM29">
+                <join column="IDENTIFIER"/>
+                <element column="ENUMVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleEnum30" table="ARRAY_OF_SIMPLE_ENUM30">
+                <join column="IDENTIFIER"/>
+                <element column="ENUMVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
         </class>
     </package>
 </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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -232,13 +232,39 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
-            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40"
-                   >
+            <field name="ArrayListOfShort40" column="ARRAYLIST_OF_SHORT40" >
             </field>
             <field name="ArrayListOfShort41"
                    table="ARRAYLIST_OF_SHORT41">
                 <join column="IDENTIFIER"/>
                 <element column="SHORTVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum42"
+                   table="ARRAYLIST_OF_SIMPLEENUM42">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum43"
+                   column="ARRAYLIST_OF_SIMPLEENUM43" >
+            </field>
+            <field name="ArrayListOfSimpleEnum44"
+                   table="ARRAYLIST_OF_SIMPLEENUM44">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum45"
+                   table="ARRAYLIST_OF_SIMPLEENUM45">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum46"
+                   table="ARRAYLIST_OF_SIMPLEENUM46">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
                 <order column="INDEX"/>
             </field>
         </class>

Added: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm?rev=591430&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm (added)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm Fri Nov  2 12:30:50 2007
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.fieldtypes">
+        <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
+            <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"/>
+        </class>
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: 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=591430&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm (added)
+++ db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm Fri Nov  2 12:30:50 2007
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	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"/>
+        </class>
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck2/src/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
------------------------------------------------------------------------------
    svn:eol-style = LF

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -599,6 +599,81 @@
             <field name="MapOfString_Short125"
                    column="MAP_OF_STRING_SHORT125">
             </field>
+            <field name="MapOfString_SimpleEnum126"
+                   table="MAP_OF_STRING_SIMPLEENUM126">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum127"
+                   table="MAP_OF_STRING_SIMPLEENUM127">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum128"
+                   table="MAP_OF_STRING_SIMPLEENUM128">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum129"
+                   table="MAP_OF_STRING_SIMPLEENUM129">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum130"
+                   table="MAP_OF_STRING_SIMPLEENUM130">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum131"
+                   table="MAP_OF_STRING_SIMPLEENUM131">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum132"
+                   column="MAP_OF_STRING_SIMPLEENUM132">
+            </field>
+            <field name="MapOfString_SimpleEnum133"
+                   table="MAP_OF_STRING_SIMPLEENUM133">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum134"
+                   table="MAP_OF_STRING_SIMPLEENUM134">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum135"
+                   table="MAP_OF_STRING_SIMPLEENUM135">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum136"
+                   table="MAP_OF_STRING_SIMPLEENUM136">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum137"
+                   table="MAP_OF_STRING_SIMPLEENUM137">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum138"
+                   table="MAP_OF_STRING_SIMPLEENUM138">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
         </class>
     </package>
 </orm>

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -521,6 +521,68 @@
             </field>
             <field name="MapOfShort_String116" column="MAP_SHORT116_STR">
             </field>
-        </class>
+            <field name="MapOfSimpleEnum_String117" table="MAP_SIMPLEENUM117_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String118" table="MAP_SIMPLEENUM118_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String119" table="MAP_SIMPLEENUM119_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String120" table="MAP_SIMPLEENUM120_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String121" table="MAP_SIMPLEENUM121_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String122" table="MAP_SIMPLEENUM122_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String123" column="MAP_SIMPLEENUM123_STR">
+            </field>
+            <field name="MapOfSimpleEnum_String124" table="MAP_SIMPLEENUM124_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String125" table="MAP_SIMPLEENUM125_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String126" table="MAP_SIMPLEENUM126_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String127" table="MAP_SIMPLEENUM127_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String128" table="MAP_SIMPLEENUM128_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String129" table="MAP_SIMPLEENUM129_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field> 
+       </class>
     </package>
 </orm>

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -125,6 +125,17 @@
                 <element column="SHORTVAL"/>
                 <order column="ORDER_COL"/>
             </field>
+            <field name="ArrayOfSimpleEnum28" column="ARRAY_OF_SIMPLE_ENUM28"/>
+            <field name="ArrayOfSimpleEnum29" table="ARRAY_OF_SIMPLE_ENUM29">
+                <join column="IDENTIFIER"/>
+                <element column="ENUMVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
+            <field name="ArrayOfSimpleEnum30" table="ARRAY_OF_SIMPLE_ENUM30">
+                <join column="IDENTIFIER"/>
+                <element column="ENUMVAL"/>
+                <order column="ORDER_COL"/>
+            </field>
         </class>
     </package>
 </orm>

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -211,6 +211,33 @@
                 <element column="SHORTVAL"/>
                 <order column="INDEX"/>
             </field>
+            <field name="ArrayListOfSimpleEnum42"
+                   table="ARRAYLIST_OF_SIMPLEENUM42">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum43"
+                   column="ARRAYLIST_OF_SIMPLEENUM43" >
+            </field>
+            <field name="ArrayListOfSimpleEnum44"
+                   table="ARRAYLIST_OF_SIMPLEENUM44">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum45"
+                   table="ARRAYLIST_OF_SIMPLEENUM45">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
+            <field name="ArrayListOfSimpleEnum46"
+                   table="ARRAYLIST_OF_SIMPLEENUM46">
+                <join column="IDENTIFIER"/>
+                <element column="SIMPLEENUMVAL"/>
+                <order column="INDEX"/>
+            </field>
         </class>
     </package>
 </orm>

Added: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm?rev=591430&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm (added)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm Fri Nov  2 12:30:50 2007
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.fieldtypes">
+        <class name="FieldsOfSimpleEnum" table="FIELDSOFENUMNAME">
+            <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"/>
+        </class>
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard.orm
------------------------------------------------------------------------------
    svn:eol-style = LF

Added: 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=591430&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm (added)
+++ db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm Fri Nov  2 12:30:50 2007
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<orm xmlns="http://java.sun.com/xml/ns/jdo/orm"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://java.sun.com/xml/ns/jdo/orm 
+	http://java.sun.com/xml/ns/jdo/orm_2_1.xsd">
+    <package name="org.apache.jdo.tck.pc.fieldtypes">
+        <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"/>
+        </class>
+    </package>
+</orm>

Propchange: db/jdo/trunk/tck2/src/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/FieldsOfSimpleEnum-standard1.orm
------------------------------------------------------------------------------
    svn:eol-style = LF

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -601,6 +601,81 @@
             <field name="MapOfString_Short125"
                    column="MAP_OF_STRING_SHORT125">
             </field>
+            <field name="MapOfString_SimpleEnum126"
+                   table="MAP_OF_STRING_SIMPLEENUM126">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum127"
+                   table="MAP_OF_STRING_SIMPLEENUM127">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum128"
+                   table="MAP_OF_STRING_SIMPLEENUM128">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum129"
+                   table="MAP_OF_STRING_SIMPLEENUM129">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum130"
+                   table="MAP_OF_STRING_SIMPLEENUM130">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum131"
+                   table="MAP_OF_STRING_SIMPLEENUM131">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum132"
+                   column="MAP_OF_STRING_SIMPLEENUM132">
+            </field>
+            <field name="MapOfString_SimpleEnum133"
+                   table="MAP_OF_STRING_SIMPLEENUM133">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum134"
+                   table="MAP_OF_STRING_SIMPLEENUM134">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum135"
+                   table="MAP_OF_STRING_SIMPLEENUM135">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum136"
+                   table="MAP_OF_STRING_SIMPLEENUM136">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum137"
+                   table="MAP_OF_STRING_SIMPLEENUM137">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfString_SimpleEnum138"
+                   table="MAP_OF_STRING_SIMPLEENUM138">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
         </class>
     </package>
 </orm>

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=591430&r1=591429&r2=591430&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 Fri Nov  2 12:30:50 2007
@@ -568,6 +568,68 @@
             </field>
             <field name="MapOfShort_String116" column="MAP_SHORT116_STR">
             </field>
+            <field name="MapOfSimpleEnum_String117" table="MAP_SIMPLEENUM117_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String118" table="MAP_SIMPLEENUM118_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String119" table="MAP_SIMPLEENUM119_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String120" table="MAP_SIMPLEENUM120_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String121" table="MAP_SIMPLEENUM121_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String122" table="MAP_SIMPLEENUM122_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String123" column="MAP_SIMPLEENUM123_STR">
+            </field>
+            <field name="MapOfSimpleEnum_String124" table="MAP_SIMPLEENUM124_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String125" table="MAP_SIMPLEENUM125_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String126" table="MAP_SIMPLEENUM126_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String127" table="MAP_SIMPLEENUM127_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String128" table="MAP_SIMPLEENUM128_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
+            <field name="MapOfSimpleEnum_String129" table="MAP_SIMPLEENUM129_STR">
+                <join column="IDENTIFIER"/>
+                <key column="KEYVAL"/>
+                <value column="VALUEVAL"/>
+            </field>
         </class>
     </package>
 </orm>

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=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema.sql Fri Nov  2 12:30:50 2007
@@ -357,6 +357,8 @@
 DROP TABLE ARRAY_OF_INTEGER23;
 DROP TABLE ARRAY_OF_LONG25;
 DROP TABLE ARRAY_OF_SHORT27;
+DROP TABLE ARRAY_OF_SIMPLEENUM29;
+DROP TABLE ARRAY_OF_SIMPLEENUM30;
 DROP TABLE ARRAY_COLLECTIONS;
 
 DROP TABLE ARRAYLIST_OF_OBJECT0;
@@ -390,6 +392,10 @@
 DROP TABLE ARRAYLIST_OF_LONG38;
 DROP TABLE ARRAYLIST_OF_SHORT39;
 DROP TABLE ARRAYLIST_OF_SHORT41;
+DROP TABLE ARRAYLIST_OF_SIMPLEENUM42;
+DROP TABLE ARRAYLIST_OF_SIMPLEENUM44;
+DROP TABLE ARRAYLIST_OF_SIMPLEENUM45;
+DROP TABLE ARRAYLIST_OF_SIMPLEENUM46;
 DROP TABLE ARRAYLIST_COLLECTIONS;
 
 DROP TABLE COLLECTION_OF_OBJECT0;
@@ -699,6 +705,18 @@
 DROP TABLE MAP_OF_STRING_INTEGER117;
 DROP TABLE MAP_OF_STRING_LONG120;
 DROP TABLE MAP_OF_STRING_SHORT123;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM126;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM127;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM128;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM129;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM130;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM131;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM133;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM134;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM135;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM136;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM137;
+DROP TABLE MAP_OF_STRING_SIMPLEENUM138;
 DROP TABLE MAPSTRINGKEY_COLLECTIONS;
 
 DROP TABLE HASHMAP_STR_OBJECT0;
@@ -865,6 +883,18 @@
 DROP TABLE MAP_SHORT111_STR;
 DROP TABLE MAP_SHORT112_STR;
 DROP TABLE MAP_SHORT114_STR;
+DROP TABLE MAP_SIMPLEENUM117_STR;
+DROP TABLE MAP_SIMPLEENUM118_STR;
+DROP TABLE MAP_SIMPLEENUM119_STR;
+DROP TABLE MAP_SIMPLEENUM120_STR;
+DROP TABLE MAP_SIMPLEENUM121_STR;
+DROP TABLE MAP_SIMPLEENUM122_STR;
+DROP TABLE MAP_SIMPLEENUM124_STR;
+DROP TABLE MAP_SIMPLEENUM125_STR;
+DROP TABLE MAP_SIMPLEENUM126_STR;
+DROP TABLE MAP_SIMPLEENUM127_STR;
+DROP TABLE MAP_SIMPLEENUM128_STR;
+DROP TABLE MAP_SIMPLEENUM129_STR;
 DROP TABLE MAPSTRINGVALUE_COLLECTIONS;
 
 DROP TABLE HASHTBL_STR_OBJECT0;
@@ -1288,6 +1318,7 @@
 DROP TABLE FIELDSOFCHARACTER;
 DROP TABLE FIELDSOFDATE;
 DROP TABLE FIELDSOFDOUBLE;
+DROP TABLE FIELDSOFENUMNAME;
 DROP TABLE FIELDSOFFLOAT;
 DROP TABLE FIELDSOFINTEGER;
 DROP TABLE FIELDSOFLOCALE;
@@ -1817,6 +1848,86 @@
 
 ALTER TABLE FIELDSOFDOUBLE ADD CONSTRAINT FIELDSOFDOUBLE_PK PRIMARY KEY (IDENTIFIER);
 
+CREATE TABLE FIELDSOFENUMNAME
+(
+    IDENTIFIER INTEGER NOT NULL,
+    ENUM0 CHAR(2),
+    ENUM1 CHAR(2),
+    ENUM102 CHAR(2),
+    ENUM103 CHAR(2),
+    ENUM104 VARCHAR(256),
+    ENUM108 VARCHAR(256),
+    ENUM109 VARCHAR(256),
+    ENUM11 VARCHAR(256),
+    ENUM110 CHAR(2),
+    ENUM112 CHAR(2),
+    ENUM113 CHAR(2),
+    ENUM114 CHAR(2),
+    ENUM119 VARCHAR(256),
+    ENUM12 VARCHAR(256),
+    ENUM120 VARCHAR(256),
+    ENUM121 VARCHAR(256),
+    ENUM124 CHAR(2),
+    ENUM125 CHAR(2),
+    ENUM126 CHAR(2),
+    ENUM128 CHAR(2),
+    ENUM129 VARCHAR(256),
+    ENUM13 VARCHAR(256),
+    ENUM130 VARCHAR(256),
+    ENUM138 VARCHAR(256),
+    ENUM139 CHAR(2),
+    ENUM140 CHAR(2),
+    ENUM16 CHAR(2),
+    ENUM17 CHAR(2),
+    ENUM18 VARCHAR(256),
+    ENUM2 VARCHAR(256),
+    ENUM20 VARCHAR(256),
+    ENUM21 VARCHAR(256),
+    ENUM22 CHAR(2),
+    ENUM30 CHAR(2),
+    ENUM31 CHAR(2),
+    ENUM32 CHAR(2),
+    ENUM36 VARCHAR(256),
+    ENUM37 VARCHAR(256),
+    ENUM38 VARCHAR(256),
+    ENUM4 VARCHAR(256),
+    ENUM40 CHAR(2),
+    ENUM41 CHAR(2),
+    ENUM42 CHAR(2),
+    ENUM47 CHAR(2),
+    ENUM48 VARCHAR(256),
+    ENUM49 VARCHAR(256),
+    ENUM5 VARCHAR(256),
+    ENUM52 VARCHAR(256),
+    ENUM53 CHAR(2),
+    ENUM54 CHAR(2),
+    ENUM56 CHAR(2),
+    ENUM57 CHAR(2),
+    ENUM58 VARCHAR(256),
+    ENUM6 VARCHAR(256),
+    ENUM66 VARCHAR(256),
+    ENUM67 VARCHAR(256),
+    ENUM68 CHAR(2),
+    ENUM72 CHAR(2),
+    ENUM73 CHAR(2),
+    ENUM74 CHAR(2),
+    ENUM76 VARCHAR(256),
+    ENUM77 VARCHAR(256),
+    ENUM78 VARCHAR(256),
+    ENUM83 VARCHAR(256),
+    ENUM84 CHAR(2),
+    ENUM85 CHAR(2),
+    ENUM88 CHAR(2),
+    ENUM89 CHAR(2),
+    ENUM90 VARCHAR(256),
+    ENUM92 VARCHAR(256),
+    ENUM93 VARCHAR(256),
+    ENUM94 VARCHAR(256)
+);
+
+ALTER TABLE FIELDSOFENUMNAME ADD CONSTRAINT 
+      FIELDSOFENUMNAME_PK PRIMARY KEY (IDENTIFIER);
+
 CREATE TABLE FIELDSOFFLOAT
 (
     IDENTIFIER INTEGER NOT NULL,
@@ -3260,6 +3371,7 @@
    ARRAY_OF_INTEGER22 LONG VARCHAR FOR BIT DATA,
    ARRAY_OF_LONG24 LONG VARCHAR FOR BIT DATA,
    ARRAY_OF_SHORT26 LONG VARCHAR FOR BIT DATA,
+   ARRAY_OF_SIMPLEENUM28 LONG VARCHAR FOR BIT DATA,
    CONSTRAINT AC_PK PRIMARY KEY (IDENTIFIER)
 );
 
@@ -3382,6 +3494,20 @@
     SHORTVAL SMALLINT
 );
 
+CREATE TABLE ARRAY_OF_SIMPLEENUM29
+(
+    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+    ORDER_COL BIGINT,
+    ENUMVAL CHAR(2)
+);
+
+CREATE TABLE ARRAY_OF_SIMPLEENUM30
+(
+    IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+    ORDER_COL BIGINT,
+    ENUMVAL NUMERIC(2,0)
+);
+
 --CollectionCollections
 
 CREATE TABLE COLLECTION_COLLECTIONS
@@ -3884,6 +4010,7 @@
 	ARRAYLIST_OF_INTEGER34 LONG VARCHAR FOR BIT DATA,
 	ARRAYLIST_OF_LONG37 LONG VARCHAR FOR BIT DATA,
 	ARRAYLIST_OF_SHORT40 LONG VARCHAR FOR BIT DATA,
+	ARRAYLIST_OF_SIMPLEENUM43 LONG VARCHAR FOR BIT DATA,
     CONSTRAINT ALC_PK PRIMARY KEY (IDENTIFIER)
 );
 
@@ -4104,6 +4231,34 @@
     INDEX INTEGER NOT NULL
 );
 
+CREATE TABLE ARRAYLIST_OF_SIMPLEENUM42
+(
+    IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
+    SIMPLEENUMVAL CHAR(2),
+    INDEX INTEGER NOT NULL
+);
+
+CREATE TABLE ARRAYLIST_OF_SIMPLEENUM44
+(
+    IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
+    SIMPLEENUMVAL CHAR(2),
+    INDEX INTEGER NOT NULL
+);
+
+CREATE TABLE ARRAYLIST_OF_SIMPLEENUM45
+(
+    IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
+    SIMPLEENUMVAL NUMERIC(2,0),
+    INDEX INTEGER NOT NULL
+);
+
+CREATE TABLE ARRAYLIST_OF_SIMPLEENUM46
+(
+    IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
+    SIMPLEENUMVAL NUMERIC(2,0),
+    INDEX INTEGER NOT NULL
+);
+
 --LinkedListCollections
 
 CREATE TABLE LINKEDLIST_COLLECTIONS
@@ -5224,6 +5379,7 @@
 	MAP_OF_STRING_INTEGER119 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_LONG122 LONG VARCHAR FOR BIT DATA,
 	MAP_OF_STRING_SHORT125 LONG VARCHAR FOR BIT DATA,
+	MAP_OF_STRING_SIMPLEENUM132 LONG VARCHAR FOR BIT DATA,
     CONSTRAINT MSKC_PK PRIMARY KEY (IDENTIFIER)
 );
 
@@ -5827,6 +5983,90 @@
     VALUEVAL SMALLINT NOT NULL
 );
 
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM126
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM127
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM128
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM129
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM130
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM131
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL CHAR(2) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM133
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL NUMERIC(2,0) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM134
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL NUMERIC(2,0) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM135
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100),
+    VALUEVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM136
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL INTEGER NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM137
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL NUMERIC(2,0) NOT NULL
+);
+
+CREATE TABLE MAP_OF_STRING_SIMPLEENUM138
+(
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGKEY_COLLECTIONS NOT NULL,
+    KEYVAL VARCHAR(100) NOT NULL,
+    VALUEVAL NUMERIC(2,0) NOT NULL
+);
+
 --HashMapOfStringKeyCollections
 
 CREATE TABLE HASHMAPSTRINGKEY_COLLECTIONS
@@ -8606,6 +8846,7 @@
 	MAP_INTEGER98_STR LONG VARCHAR FOR BIT DATA,
 	MAP_LONG107_STR LONG VARCHAR FOR BIT DATA,
 	MAP_SHORT116_STR LONG VARCHAR FOR BIT DATA,
+	MAP_SIMPLEENUM123_STR LONG VARCHAR FOR BIT DATA,
     CONSTRAINT MSVC_PK PRIMARY KEY (IDENTIFIER)
 );
 
@@ -9093,6 +9334,78 @@
     IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
     VALUEVAL VARCHAR(100) NOT NULL,
     KEYVAL SMALLINT
+);
+
+CREATE TABLE MAP_SIMPLEENUM117_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM118_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM119_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM120_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM121_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM122_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL CHAR(2)
+);
+
+CREATE TABLE MAP_SIMPLEENUM124_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_SIMPLEENUM125_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_SIMPLEENUM126_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_SIMPLEENUM127_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_SIMPLEENUM128_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
+);
+
+CREATE TABLE MAP_SIMPLEENUM129_STR (
+    IDENTIFIER INTEGER REFERENCES MAPSTRINGVALUE_COLLECTIONS NOT NULL,
+    VALUEVAL VARCHAR(100) NOT NULL,
+    KEYVAL NUMERIC(2,0)
 );
 
 --TreeMapOfStringKeyCollections

Modified: db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema1.sql
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema1.sql?rev=591430&r1=591429&r2=591430&view=diff
==============================================================================
--- db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema1.sql (original)
+++ db/jdo/trunk/tck2/src/sql/derby/applicationidentity/schema1.sql Fri Nov  2 12:30:50 2007
@@ -166,4 +166,90 @@
     ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
         (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID) ON DELETE SET NULL;
 
+-------------------------
+-- fieldtypes (enum)
+-------------------------
+
+DROP TABLE FIELDSOFENUMORDINAL;
+
+CREATE TABLE FIELDSOFENUMORDINAL
+(
+    IDENTIFIER INTEGER NOT NULL,
+    ENUM0 SMALLINT,
+    ENUM1 SMALLINT,
+    ENUM102 SMALLINT,
+    ENUM103 SMALLINT,
+    ENUM104 INTEGER,
+    ENUM108 INTEGER,
+    ENUM109 INTEGER,
+    ENUM11 INTEGER,
+    ENUM110 BIGINT,
+    ENUM112 BIGINT,
+    ENUM113 BIGINT,
+    ENUM114 BIGINT,
+    ENUM119 NUMERIC(2,0),
+    ENUM12 NUMERIC(2,0),
+    ENUM120 NUMERIC(2,0),
+    ENUM121 NUMERIC(2,0),
+    ENUM124 SMALLINT,
+    ENUM125 SMALLINT,
+    ENUM126 SMALLINT,
+    ENUM128 SMALLINT,
+    ENUM129 INTEGER,
+    ENUM13 INTEGER,
+    ENUM130 INTEGER,
+    ENUM138 INTEGER,
+    ENUM139 BIGINT,
+    ENUM140 BIGINT,
+    ENUM16 BIGINT,
+    ENUM17 BIGINT,
+    ENUM18 NUMERIC(2,0),
+    ENUM2 NUMERIC(2,0),
+    ENUM20 NUMERIC(2,0),
+    ENUM21 NUMERIC(2,0),
+    ENUM22 SMALLINT,
+    ENUM30 SMALLINT,
+    ENUM31 SMALLINT,
+    ENUM32 SMALLINT,
+    ENUM36 INTEGER,
+    ENUM37 INTEGER,
+    ENUM38 INTEGER,
+    ENUM4 INTEGER,
+    ENUM40 BIGINT,
+    ENUM41 BIGINT,
+    ENUM42 BIGINT,
+    ENUM47 BIGINT,
+    ENUM48 NUMERIC(2,0),
+    ENUM49 NUMERIC(2,0),
+    ENUM5 NUMERIC(2,0),
+    ENUM52 NUMERIC(2,0),
+    ENUM53 SMALLINT,
+    ENUM54 SMALLINT,
+    ENUM56 SMALLINT,
+    ENUM57 SMALLINT,
+    ENUM58 INTEGER,
+    ENUM6 INTEGER,
+    ENUM66 INTEGER,
+    ENUM67 INTEGER,
+    ENUM68 BIGINT,
+    ENUM72 BIGINT,
+    ENUM73 BIGINT,
+    ENUM74 BIGINT,
+    ENUM76 NUMERIC(2,0),
+    ENUM77 NUMERIC(2,0),
+    ENUM78 NUMERIC(2,0),
+    ENUM83 NUMERIC(2,0),
+    ENUM84 SMALLINT,
+    ENUM85 SMALLINT,
+    ENUM88 SMALLINT,
+    ENUM89 SMALLINT,
+    ENUM90 INTEGER,
+    ENUM92 INTEGER,
+    ENUM93 INTEGER,
+    ENUM94 INTEGER
+);
+
+ALTER TABLE FIELDSOFENUMORDINAL ADD CONSTRAINT
+    FIELDSOFENUMORDINAL_PK PRIMARY KEY (IDENTIFIER);
+
 disconnect;



Mime
View raw message