You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mc...@apache.org on 2005/10/13 20:28:34 UTC
svn commit: r320862 - in /incubator/jdo/trunk/tck20/test:
java/org/apache/jdo/tck/pc/fieldtypes/
jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/
jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/
orm/applicationidentity/org/apache/jdo/tc...
Author: mcaisse
Date: Thu Oct 13 11:28:29 2005
New Revision: 320862
URL: http://svn.apache.org/viewcvs?rev=320862&view=rev
Log:
JDO-98 Fixed mapping for ArrayCollections
Modified:
incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
Modified: incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java (original)
+++ incubator/jdo/trunk/tck20/test/java/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.java Thu Oct 13 11:28:29 2005
@@ -52,34 +52,34 @@
public Short [] ArrayOfShort27;
public static final String [] fieldSpecs = {
- "embedded-element=true public Object [] ArrayOfObject0",
+ "serialized=true public Object [] ArrayOfObject0",
"embedded-element=false public Object [] ArrayOfObject1",
- "embedded-element=true public SimpleClass [] ArrayOfSimpleClass2",
+ "serialized=true public SimpleClass [] ArrayOfSimpleClass2",
"embedded-element=false public SimpleClass [] ArrayOfSimpleClass3",
- "embedded-element=true public SimpleInterface [] ArrayOfSimpleInterface4",
+ "serialized=true public SimpleInterface [] ArrayOfSimpleInterface4",
"embedded-element=false public SimpleInterface [] ArrayOfSimpleInterface5",
- "embedded-element=true public String [] ArrayOfString6",
- "embedded-element=false public String [] ArrayOfString7",
- "embedded-element=true public Date [] ArrayOfDate8",
- "embedded-element=false public Date [] ArrayOfDate9",
- "embedded-element=true public Locale [] ArrayOfLocale10",
- "embedded-element=false public Locale [] ArrayOfLocale11",
- "embedded-element=true public BigDecimal [] ArrayOfBigDecimal12",
- "embedded-element=false public BigDecimal [] ArrayOfBigDecimal13",
- "embedded-element=true public BigInteger [] ArrayOfBigInteger14",
- "embedded-element=false public BigInteger [] ArrayOfBigInteger15",
- "embedded-element=true public Byte [] ArrayOfByte16",
- "embedded-element=false public Byte [] ArrayOfByte17",
- "embedded-element=true public Double [] ArrayOfDouble18",
- "embedded-element=false public Double [] ArrayOfDouble19",
- "embedded-element=true public Float [] ArrayOfFloat20",
- "embedded-element=false public Float [] ArrayOfFloat21",
- "embedded-element=true public Integer [] ArrayOfInteger22",
- "embedded-element=false public Integer [] ArrayOfInteger23",
- "embedded-element=true public Long [] ArrayOfLong24",
- "embedded-element=false public Long [] ArrayOfLong25",
- "embedded-element=true public Short [] ArrayOfShort26",
- "embedded-element=false public Short [] ArrayOfShort27"
+ "embedded-element=false public String [] ArrayOfString6",
+ "embedded-element=true public String [] ArrayOfString7",
+ "embedded-element=false public Date [] ArrayOfDate8",
+ "embedded-element=true public Date [] ArrayOfDate9",
+ "embedded-element=false public Locale [] ArrayOfLocale10",
+ "embedded-element=true public Locale [] ArrayOfLocale11",
+ "embedded-element=false public BigDecimal [] ArrayOfBigDecimal12",
+ "embedded-element=true public BigDecimal [] ArrayOfBigDecimal13",
+ "embedded-element=false public BigInteger [] ArrayOfBigInteger14",
+ "embedded-element=true public BigInteger [] ArrayOfBigInteger15",
+ "embedded-element=false public Byte [] ArrayOfByte16",
+ "embedded-element=true public Byte [] ArrayOfByte17",
+ "embedded-element=false public Double [] ArrayOfDouble18",
+ "embedded-element=true public Double [] ArrayOfDouble19",
+ "embedded-element=false public Float [] ArrayOfFloat20",
+ "embedded-element=true public Float [] ArrayOfFloat21",
+ "embedded-element=false public Integer [] ArrayOfInteger22",
+ "embedded-element=true public Integer [] ArrayOfInteger23",
+ "embedded-element=false public Long [] ArrayOfLong24",
+ "embedded-element=true public Long [] ArrayOfLong25",
+ "embedded-element=false public Short [] ArrayOfShort26",
+ "embedded-element=true public Short [] ArrayOfShort27"
};
public int getLength()
{
Modified: incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo Thu Oct 13 11:28:29 2005
@@ -6,7 +6,7 @@
objectid-class="org.apache.jdo.tck.pc.fieldtypes.ArrayCollections$Oid">
<field name="identifier" primary-key="true"/>
<field name="ArrayOfObject0" persistence-modifier="persistent">
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfObject1" persistence-modifier="persistent">
@@ -14,7 +14,7 @@
</array>
</field>
<field name="ArrayOfSimpleClass2" >
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfSimpleClass3" >
@@ -22,99 +22,99 @@
</array>
</field>
<field name="ArrayOfSimpleInterface4" persistence-modifier="persistent">
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfSimpleInterface5" persistence-modifier="persistent">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfString6" >
-<array embedded-element="true">
-</array>
-</field>
-<field name="ArrayOfString7" >
+<field name="ArrayOfString6" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfDate8" >
+<field name="ArrayOfString7" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfDate9" >
+<field name="ArrayOfDate8" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfLocale10" >
+<field name="ArrayOfDate9" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfLocale11" >
+<field name="ArrayOfLocale10" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfBigDecimal12" >
+<field name="ArrayOfLocale11" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfBigDecimal13" >
+<field name="ArrayOfBigDecimal12" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfBigInteger14" >
+<field name="ArrayOfBigDecimal13" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfBigInteger15" >
+<field name="ArrayOfBigInteger14" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfByte16" >
+<field name="ArrayOfBigInteger15" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfByte17" >
+<field name="ArrayOfByte16" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfDouble18" >
+<field name="ArrayOfByte17" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfDouble19" >
+<field name="ArrayOfDouble18" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfFloat20" >
+<field name="ArrayOfDouble19" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfFloat21" >
+<field name="ArrayOfFloat20" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfInteger22" >
+<field name="ArrayOfFloat21" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfInteger23" >
+<field name="ArrayOfInteger22" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfLong24" >
+<field name="ArrayOfInteger23" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfLong25" >
+<field name="ArrayOfLong24" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfShort26" >
+<field name="ArrayOfLong25" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfShort27" >
+<field name="ArrayOfShort26" serialized="true">
<array embedded-element="false">
+</array>
+</field>
+<field name="ArrayOfShort27" >
+<array embedded-element="true">
</array>
</field>
</class>
Modified: incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo (original)
+++ incubator/jdo/trunk/tck20/test/jdo/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections.jdo Thu Oct 13 11:28:29 2005
@@ -4,7 +4,7 @@
<package name="org.apache.jdo.tck.pc.fieldtypes">
<class name="ArrayCollections" identity-type="datastore">
<field name="ArrayOfObject0" persistence-modifier="persistent">
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfObject1" persistence-modifier="persistent">
@@ -12,7 +12,7 @@
</array>
</field>
<field name="ArrayOfSimpleClass2" >
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfSimpleClass3" >
@@ -20,99 +20,99 @@
</array>
</field>
<field name="ArrayOfSimpleInterface4" persistence-modifier="persistent">
-<array embedded-element="true">
+<array serialized-element="true">
</array>
</field>
<field name="ArrayOfSimpleInterface5" persistence-modifier="persistent">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfString6" >
-<array embedded-element="true">
-</array>
-</field>
-<field name="ArrayOfString7" >
+<field name="ArrayOfString6" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfDate8" >
+<field name="ArrayOfString7" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfDate9" >
+<field name="ArrayOfDate8" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfLocale10" >
+<field name="ArrayOfDate9" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfLocale11" >
+<field name="ArrayOfLocale10" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfBigDecimal12" >
+<field name="ArrayOfLocale11" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfBigDecimal13" >
+<field name="ArrayOfBigDecimal12" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfBigInteger14" >
+<field name="ArrayOfBigDecimal13" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfBigInteger15" >
+<field name="ArrayOfBigInteger14" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfByte16" >
+<field name="ArrayOfBigInteger15" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfByte17" >
+<field name="ArrayOfByte16" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfDouble18" >
+<field name="ArrayOfByte17" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfDouble19" >
+<field name="ArrayOfDouble18" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfFloat20" >
+<field name="ArrayOfDouble19" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfFloat21" >
+<field name="ArrayOfFloat20" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfInteger22" >
+<field name="ArrayOfFloat21" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfInteger23" >
+<field name="ArrayOfInteger22" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfLong24" >
+<field name="ArrayOfInteger23" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfLong25" >
+<field name="ArrayOfLong24" serialized="true">
<array embedded-element="false">
</array>
</field>
-<field name="ArrayOfShort26" >
+<field name="ArrayOfLong25" >
<array embedded-element="true">
</array>
</field>
-<field name="ArrayOfShort27" >
+<field name="ArrayOfShort26" serialized="true">
<array embedded-element="false">
+</array>
+</field>
+<field name="ArrayOfShort27" >
+<array embedded-element="true">
</array>
</field>
</class>
Modified: incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Thu Oct 13 11:28:29 2005
@@ -7,34 +7,101 @@
<package name="org.apache.jdo.tck.pc.fieldtypes">
<class name="ArrayCollections" table="ARRAY_COLLECTIONS">
<field name="identifier" column="IDENTIFIER" primary-key="true"/>
- <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
- <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1"/>
- <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"/>
- <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3"/>
- <field name="ArrayOfSimpleInterface4" column="ARRAY_OF_SIMPLE_INTERFACE4"/>
- <field name="ArrayOfSimpleInterface5" table="ARRAY_OF_SIMPLE_INTERFACE5"/>
+ <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
+ <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
+ <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfSimpleInterface4"
+ table="ARRAY_OF_SIMPLE_INTERFACE4">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
+ <field name="ArrayOfSimpleInterface5"
+ table="ARRAY_OF_SIMPLE_INTERFACE5">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
- <field name="ArrayOfString7" table="ARRAY_OF_STRING7"/>
+ <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
+ <join column="IDENTIFIER"/>
+ <element column="STRINGVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
- <field name="ArrayOfDate9" table="ARRAY_OF_DATE9"/>
+ <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
+ <join column="IDENTIFIER"/>
+ <element column="DATEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
- <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11"/>
+ <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
+ <join column="IDENTIFIER"/>
+ <element column="LOCALEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
- <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13"/>
+ <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
+ <join column="IDENTIFIER"/>
+ <element column="BIG_DECIMALVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
- <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15"/>
+ <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
+ <join column="IDENTIFIER"/>
+ <element column="BIG_INTEGERVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
- <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17"/>
+ <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
+ <join column="IDENTIFIER"/>
+ <element column="BYTEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
- <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19"/>
+ <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
+ <join column="IDENTIFIER"/>
+ <element column="DOUBLEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
- <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21"/>
+ <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
+ <join column="IDENTIFIER"/>
+ <element column="FLOATVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
- <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23"/>
+ <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
+ <join column="IDENTIFIER"/>
+ <element column="INTEGERVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
- <field name="ArrayOfLong25" table="ARRAY_OF_LONG25"/>
+ <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
+ <join column="IDENTIFIER"/>
+ <element column="LONGVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
- <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27"/>
+ <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
+ <join column="IDENTIFIER"/>
+ <element column="SHORTVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
</class>
</package>
</orm>
Modified: incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm (original)
+++ incubator/jdo/trunk/tck20/test/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayCollections-derby.orm Thu Oct 13 11:28:29 2005
@@ -9,49 +9,101 @@
<datastore-identity strategy="identity"
column="DATASTORE_IDENTITY"/>
<field name="identifier" column="IDENTIFIER"/>
- <field name="ArrayOfObject0" column="ARRAY_OF_OBJECT0"/>
- <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1"/>
- <field name="ArrayOfSimpleClass2" column="ARRAY_OF_SIMPLE_CLASS2"
- />
- <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3"/>
+ <field name="ArrayOfObject0" table="ARRAY_OF_OBJECT0">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
+ <field name="ArrayOfObject1" table="ARRAY_OF_OBJECT1">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfSimpleClass2" table="ARRAY_OF_SIMPLE_CLASS2">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
+ <field name="ArrayOfSimpleClass3" table="ARRAY_OF_SIMPLE_CLASS3">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
<field name="ArrayOfSimpleInterface4"
- column="ARRAY_OF_SIMPLE_INTERFACE4"
- />
+ table="ARRAY_OF_SIMPLE_INTERFACE4">
+ <join column="IDENTIFIER"/>
+ <element column="OBJVAL"/>
+ </field>
<field name="ArrayOfSimpleInterface5"
- table="ARRAY_OF_SIMPLE_INTERFACE5"/>
- <field name="ArrayOfString6" column="ARRAY_OF_STRING6"
- />
- <field name="ArrayOfString7" table="ARRAY_OF_STRING7"/>
- <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"
- />
- <field name="ArrayOfDate9" table="ARRAY_OF_DATE9"/>
- <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"
- />
- <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11"/>
- <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"
- />
- <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13"/>
- <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"
- />
- <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15"/>
- <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"
- />
- <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17"/>
- <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"
- />
- <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19"/>
- <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"
- />
- <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21"/>
- <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"
- />
- <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23"/>
- <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"
- />
- <field name="ArrayOfLong25" table="ARRAY_OF_LONG25"/>
- <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"
- />
- <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27"/>
+ table="ARRAY_OF_SIMPLE_INTERFACE5">
+ <join column="IDENTIFIER"/>
+ <element column="OBJREF"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfString6" column="ARRAY_OF_STRING6"/>
+ <field name="ArrayOfString7" table="ARRAY_OF_STRING7">
+ <join column="IDENTIFIER"/>
+ <element column="STRINGVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfDate8" column="ARRAY_OF_DATE8"/>
+ <field name="ArrayOfDate9" table="ARRAY_OF_DATE9">
+ <join column="IDENTIFIER"/>
+ <element column="DATEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfLocale10" column="ARRAY_OF_LOCALE10"/>
+ <field name="ArrayOfLocale11" table="ARRAY_OF_LOCALE11">
+ <join column="IDENTIFIER"/>
+ <element column="LOCALEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfBigDecimal12" column="ARRAY_OF_BIG_DECIMAL12"/>
+ <field name="ArrayOfBigDecimal13" table="ARRAY_OF_BIG_DECIMAL13">
+ <join column="IDENTIFIER"/>
+ <element column="BIG_DECIMALVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfBigInteger14" column="ARRAY_OF_BIG_INTEGER14"/>
+ <field name="ArrayOfBigInteger15" table="ARRAY_OF_BIG_INTEGER15">
+ <join column="IDENTIFIER"/>
+ <element column="BIG_INTEGERVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfByte16" column="ARRAY_OF_BYTE16"/>
+ <field name="ArrayOfByte17" table="ARRAY_OF_BYTE17">
+ <join column="IDENTIFIER"/>
+ <element column="BYTEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfDouble18" column="ARRAY_OF_DOUBLE18"/>
+ <field name="ArrayOfDouble19" table="ARRAY_OF_DOUBLE19">
+ <join column="IDENTIFIER"/>
+ <element column="DOUBLEVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfFloat20" column="ARRAY_OF_FLOAT20"/>
+ <field name="ArrayOfFloat21" table="ARRAY_OF_FLOAT21">
+ <join column="IDENTIFIER"/>
+ <element column="FLOATVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfInteger22" column="ARRAY_OF_INTEGER22"/>
+ <field name="ArrayOfInteger23" table="ARRAY_OF_INTEGER23">
+ <join column="IDENTIFIER"/>
+ <element column="INTEGERVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfLong24" column="ARRAY_OF_LONG24"/>
+ <field name="ArrayOfLong25" table="ARRAY_OF_LONG25">
+ <join column="IDENTIFIER"/>
+ <element column="LONGVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
+ <field name="ArrayOfShort26" column="ARRAY_OF_SHORT26"/>
+ <field name="ArrayOfShort27" table="ARRAY_OF_SHORT27">
+ <join column="IDENTIFIER"/>
+ <element column="SHORTVAL"/>
+ <order column="ORDER_COL"/>
+ </field>
</class>
</package>
</orm>
Modified: incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Thu Oct 13 11:28:29 2005
@@ -2763,9 +2763,6 @@
CREATE TABLE ARRAY_COLLECTIONS
(
IDENTIFIER INTEGER NOT NULL,
- ARRAY_OF_OBJECT0 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_CLASS2 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_INTERFACE4 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_STRING6 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_DATE8 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_LOCALE10 LONG VARCHAR FOR BIT DATA,
@@ -2780,87 +2777,122 @@
CONSTRAINT AC_PK PRIMARY KEY (IDENTIFIER)
);
+CREATE TABLE ARRAY_OF_OBJECT0
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
+
CREATE TABLE ARRAY_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
+CREATE TABLE ARRAY_OF_SIMPLE_CLASS2
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
+
CREATE TABLE ARRAY_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
+CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE4
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
+
CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE5
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE ARRAY_OF_STRING7
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
STRINGVAL VARCHAR(1024)
);
CREATE TABLE ARRAY_OF_DATE9
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
DATEVAL TIMESTAMP
);
CREATE TABLE ARRAY_OF_LOCALE11
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
LOCALEVAL CHAR(20)
);
CREATE TABLE ARRAY_OF_BIG_DECIMAL13
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BIG_DECIMALVAL DECIMAL(27,16)
);
CREATE TABLE ARRAY_OF_BIG_INTEGER15
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BIG_INTEGERVAL BIGINT
);
CREATE TABLE ARRAY_OF_BYTE17
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BYTEVAL SMALLINT
);
CREATE TABLE ARRAY_OF_DOUBLE19
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
DOUBLEVAL DOUBLE
);
CREATE TABLE ARRAY_OF_FLOAT21
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
FLOATVAL FLOAT
);
CREATE TABLE ARRAY_OF_INTEGER23
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
INTEGERVAL INTEGER
);
CREATE TABLE ARRAY_OF_LONG25
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
LONGVAL BIGINT
);
CREATE TABLE ARRAY_OF_SHORT27
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
SHORTVAL SMALLINT
);
Modified: incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql?rev=320862&r1=320861&r2=320862&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Thu Oct 13 11:28:29 2005
@@ -2746,9 +2746,6 @@
(
DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
IDENTIFIER INTEGER NOT NULL,
- ARRAY_OF_OBJECT0 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_CLASS2 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_INTERFACE4 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_STRING6 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_DATE8 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_LOCALE10 LONG VARCHAR FOR BIT DATA,
@@ -2763,88 +2760,122 @@
CONSTRAINT AC_PK PRIMARY KEY (IDENTIFIER)
);
+CREATE TABLE ARRAY_OF_OBJECT0
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
CREATE TABLE ARRAY_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
+CREATE TABLE ARRAY_OF_SIMPLE_CLASS2
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
+
CREATE TABLE ARRAY_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
+CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE4
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
+ OBJVAL LONG VARCHAR FOR BIT DATA
+);
+
CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE5
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE ARRAY_OF_STRING7
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
STRINGVAL VARCHAR(1024)
);
CREATE TABLE ARRAY_OF_DATE9
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
DATEVAL TIMESTAMP
);
CREATE TABLE ARRAY_OF_LOCALE11
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
LOCALEVAL CHAR(20)
);
CREATE TABLE ARRAY_OF_BIG_DECIMAL13
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BIG_DECIMALVAL DECIMAL(27,16)
);
CREATE TABLE ARRAY_OF_BIG_INTEGER15
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BIG_INTEGERVAL BIGINT
);
CREATE TABLE ARRAY_OF_BYTE17
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
BYTEVAL SMALLINT
);
CREATE TABLE ARRAY_OF_DOUBLE19
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
DOUBLEVAL DOUBLE
);
CREATE TABLE ARRAY_OF_FLOAT21
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
FLOATVAL FLOAT
);
CREATE TABLE ARRAY_OF_INTEGER23
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
INTEGERVAL INTEGER
);
CREATE TABLE ARRAY_OF_LONG25
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
LONGVAL BIGINT
);
CREATE TABLE ARRAY_OF_SHORT27
(
IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ ORDER_COL BIGINT,
SHORTVAL SMALLINT
);