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">
-
+
@@ -14,7 +14,7 @@
-
+
@@ -22,99 +22,99 @@
-
+
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
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 @@
-
+
@@ -12,7 +12,7 @@
-
+
@@ -20,99 +20,99 @@
-
+
-
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
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 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
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 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ table="ARRAY_OF_SIMPLE_INTERFACE4">
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ table="ARRAY_OF_SIMPLE_INTERFACE5">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
);