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/07/13 22:46:15 UTC
svn commit: r216231 - in /incubator/jdo/trunk/tck20/test/sql/derby:
applicationidentity/schema.sql datastoreidentity/schema.sql
Author: mcaisse
Date: Wed Jul 13 13:46:14 2005
New Revision: 216231
URL: http://svn.apache.org/viewcvs?rev=216231&view=rev
Log:
Fix bugs in schema.sql
Modified:
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/sql/derby/applicationidentity/schema.sql
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql?rev=216231&r1=216230&r2=216231&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/applicationidentity/schema.sql Wed Jul 13 13:46:14 2005
@@ -163,6 +163,20 @@
--fieldtypes
-------------------------
+DROP TABLE ARRAY_OF_OBJECT1;
+DROP TABLE ARRAY_OF_SIMPLE_CLASS3;
+DROP TABLE ARRAY_OF_SIMPLE_INTERFACE5;
+DROP TABLE ARRAY_OF_STRING7;
+DROP TABLE ARRAY_OF_DATE9;
+DROP TABLE ARRAY_OF_LOCALE11;
+DROP TABLE ARRAY_OF_BIG_DECIMAL13;
+DROP TABLE ARRAY_OF_BIG_INTEGER15;
+DROP TABLE ARRAY_OF_BYTE17;
+DROP TABLE ARRAY_OF_DOUBLE19;
+DROP TABLE ARRAY_OF_FLOAT21;
+DROP TABLE ARRAY_OF_INTEGER23;
+DROP TABLE ARRAY_OF_LONG25;
+DROP TABLE ARRAY_OF_SHORT27;
DROP TABLE ARRAY_COLLECTIONS;
DROP TABLE ARRAYLIST_OF_OBJECT0;
@@ -221,7 +235,7 @@
DROP TABLE COLLECTION_OF_BYTE26;
DROP TABLE COLLECTION_OF_DOUBLE27;
DROP TABLE COLLECTION_OF_DOUBLE29;
-DROP TABLE COLLECTION_OF_FLOAT31;
+DROP TABLE COLLECTION_OF_FLOAT30;
DROP TABLE COLLECTION_OF_FLOAT32;
DROP TABLE COLLECTION_OF_INTEGER33;
DROP TABLE COLLECTION_OF_INTEGER35;
@@ -254,7 +268,7 @@
DROP TABLE LIST_OF_BYTE26;
DROP TABLE LIST_OF_DOUBLE27;
DROP TABLE LIST_OF_DOUBLE29;
-DROP TABLE LIST_OF_FLOAT31;
+DROP TABLE LIST_OF_FLOAT30;
DROP TABLE LIST_OF_FLOAT32;
DROP TABLE LIST_OF_INTEGER33;
DROP TABLE LIST_OF_INTEGER35;
@@ -320,7 +334,7 @@
DROP TABLE VECTOR_OF_BYTE26;
DROP TABLE VECTOR_OF_DOUBLE27;
DROP TABLE VECTOR_OF_DOUBLE29;
-DROP TABLE VECTOR_OF_FLOAT31;
+DROP TABLE VECTOR_OF_FLOAT30;
DROP TABLE VECTOR_OF_FLOAT32;
DROP TABLE VECTOR_OF_INTEGER33;
DROP TABLE VECTOR_OF_INTEGER35;
@@ -353,9 +367,9 @@
DROP TABLE SET_OF_BYTE26;
DROP TABLE SET_OF_DOUBLE27;
DROP TABLE SET_OF_DOUBLE29;
-DROP TABLE SET_OF_FLOAT31;
+DROP TABLE SET_OF_FLOAT30;
DROP TABLE SET_OF_FLOAT32;
-DROP TABLE SET_OF_INTEGER34;
+DROP TABLE SET_OF_INTEGER33;
DROP TABLE SET_OF_INTEGER35;
DROP TABLE SET_OF_LONG36;
DROP TABLE SET_OF_LONG38;
@@ -4109,7 +4123,7 @@
INDEX INTEGER
);
-CREATE TABLE SET_OF_BIG_INTEGER19
+CREATE TABLE SET_OF_BIG_INTEGER21
(
IDENTIFIER INTEGER REFERENCES SET_COLLECTIONS NOT NULL,
BIG_INTEGERVAL BIGINT,
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=216231&r1=216230&r2=216231&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/datastoreidentity/schema.sql Wed Jul 13 13:46:14 2005
@@ -172,6 +172,20 @@
--fieldtypes
-------------------------
+DROP TABLE ARRAY_OF_OBJECT1;
+DROP TABLE ARRAY_OF_SIMPLE_CLASS3;
+DROP TABLE ARRAY_OF_SIMPLE_INTERFACE5;
+DROP TABLE ARRAY_OF_STRING7;
+DROP TABLE ARRAY_OF_DATE9;
+DROP TABLE ARRAY_OF_LOCALE11;
+DROP TABLE ARRAY_OF_BIG_DECIMAL13;
+DROP TABLE ARRAY_OF_BIG_INTEGER15;
+DROP TABLE ARRAY_OF_BYTE17;
+DROP TABLE ARRAY_OF_DOUBLE19;
+DROP TABLE ARRAY_OF_FLOAT21;
+DROP TABLE ARRAY_OF_INTEGER23;
+DROP TABLE ARRAY_OF_LONG25;
+DROP TABLE ARRAY_OF_SHORT27;
DROP TABLE ARRAY_COLLECTIONS;
DROP TABLE ARRAYLIST_OF_OBJECT0;
@@ -230,7 +244,7 @@
DROP TABLE COLLECTION_OF_BYTE26;
DROP TABLE COLLECTION_OF_DOUBLE27;
DROP TABLE COLLECTION_OF_DOUBLE29;
-DROP TABLE COLLECTION_OF_FLOAT31;
+DROP TABLE COLLECTION_OF_FLOAT30;
DROP TABLE COLLECTION_OF_FLOAT32;
DROP TABLE COLLECTION_OF_INTEGER33;
DROP TABLE COLLECTION_OF_INTEGER35;
@@ -259,11 +273,11 @@
DROP TABLE LIST_OF_BIG_DECIMAL20;
DROP TABLE LIST_OF_BIG_INTEGER21;
DROP TABLE LIST_OF_BIG_INTEGER23;
-DROP TABLE LIST_OF_BYTE25;
+DROP TABLE LIST_OF_BYTE24;
DROP TABLE LIST_OF_BYTE26;
DROP TABLE LIST_OF_DOUBLE27;
DROP TABLE LIST_OF_DOUBLE29;
-DROP TABLE LIST_OF_FLOAT31;
+DROP TABLE LIST_OF_FLOAT30;
DROP TABLE LIST_OF_FLOAT32;
DROP TABLE LIST_OF_INTEGER33;
DROP TABLE LIST_OF_INTEGER35;
@@ -329,7 +343,7 @@
DROP TABLE VECTOR_OF_BYTE26;
DROP TABLE VECTOR_OF_DOUBLE27;
DROP TABLE VECTOR_OF_DOUBLE29;
-DROP TABLE VECTOR_OF_FLOAT31;
+DROP TABLE VECTOR_OF_FLOAT30;
DROP TABLE VECTOR_OF_FLOAT32;
DROP TABLE VECTOR_OF_INTEGER33;
DROP TABLE VECTOR_OF_INTEGER35;
@@ -362,9 +376,9 @@
DROP TABLE SET_OF_BYTE26;
DROP TABLE SET_OF_DOUBLE27;
DROP TABLE SET_OF_DOUBLE29;
-DROP TABLE SET_OF_FLOAT31;
+DROP TABLE SET_OF_FLOAT30;
DROP TABLE SET_OF_FLOAT32;
-DROP TABLE SET_OF_INTEGER34;
+DROP TABLE SET_OF_INTEGER33;
DROP TABLE SET_OF_INTEGER35;
DROP TABLE SET_OF_LONG36;
DROP TABLE SET_OF_LONG38;
@@ -436,49 +450,6 @@
DROP TABLE TREESET_OF_SHORT38;
DROP TABLE TREESET_COLLECTIONS;
-DROP TABLE HASHSET_OF_OBJECT0;
-DROP TABLE HASHSET_OF_OBJECT1;
-DROP TABLE HASHSET_OF_OBJECT2;
-DROP TABLE HASHSET_OF_SIMPLE_CLASS3;
-DROP TABLE HASHSET_OF_SIMPLE_CLASS4;
-DROP TABLE HASHSET_OF_SIMPLE_CLASS5;
-DROP TABLE HASHSET_OF_SIMPLE_INTERFACE6;
-DROP TABLE HASHSET_OF_SIMPLE_INTERFACE7;
-DROP TABLE HASHSET_OF_SIMPLE_INTERFACE8;
-DROP TABLE HASHSET_OF_STRING11;
-DROP TABLE HASHSET_OF_DATE14;
-DROP TABLE HASHSET_OF_LOCALE17;
-DROP TABLE HASHSET_OF_BIG_DECIMAL20;
-DROP TABLE HASHSET_OF_BIG_INTEGER23;
-DROP TABLE HASHSET_OF_BYTE26;
-DROP TABLE HASHSET_OF_DOUBLE29;
-DROP TABLE HASHSET_OF_FLOAT32;
-DROP TABLE HASHSET_OF_INTEGER35;
-DROP TABLE HASHSET_OF_LONG38;
-DROP TABLE HASHSET_OF_SHORT41;
-DROP TABLE HASHSET_COLLECTIONS;
-
-DROP TABLE TREESET_OF_OBJECT0;
-DROP TABLE TREESET_OF_OBJECT1;
-DROP TABLE TREESET_OF_OBJECT2;
-DROP TABLE TREESET_OF_SIMPLE_CLASS3;
-DROP TABLE TREESET_OF_SIMPLE_CLASS4;
-DROP TABLE TREESET_OF_SIMPLE_CLASS5;
-DROP TABLE TREESET_OF_SIMPLE_INTERFACE6;
-DROP TABLE TREESET_OF_SIMPLE_INTERFACE7;
-DROP TABLE TREESET_OF_SIMPLE_INTERFACE8;
-DROP TABLE TREESET_OF_STRING11;
-DROP TABLE TREESET_OF_DATE14;
-DROP TABLE TREESET_OF_BIG_DECIMAL17;
-DROP TABLE TREESET_OF_BIG_INTEGER20;
-DROP TABLE TREESET_OF_BYTE23;
-DROP TABLE TREESET_OF_DOUBLE26;
-DROP TABLE TREESET_OF_FLOAT29;
-DROP TABLE TREESET_OF_INTEGER32;
-DROP TABLE TREESET_OF_LONG35;
-DROP TABLE TREESET_OF_SHORT38;
-DROP TABLE TREESET_COLLECTIONS;
-
DROP TABLE MAP_OF_STRING_OBJECT0;
DROP TABLE MAP_OF_STRING_OBJECT1;
DROP TABLE MAP_OF_STRING_OBJECT2;
@@ -2797,33 +2768,107 @@
CREATE TABLE ARRAY_COLLECTIONS
(
DATASTORE_IDENTITY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
- IDENTIFIER INTEGER,
+ 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,
ARRAY_OF_BIG_DECIMAL12 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_BIG_DECIMAL13 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_BIG_INTEGER14 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_BIG_INTEGER15 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_BYTE16 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_BYTE17 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_DATE8 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_DATE9 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_DOUBLE18 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_DOUBLE19 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_FLOAT20 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_FLOAT21 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_INTEGER22 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_INTEGER23 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_LOCALE10 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_LOCALE11 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_LONG24 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_LONG25 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_OBJECT0 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_OBJECT1 LONG VARCHAR FOR BIT DATA,
ARRAY_OF_SHORT26 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SHORT27 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_INTERFACE4 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_SIMPLE_INTERFACE5 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_STRING6 LONG VARCHAR FOR BIT DATA,
- ARRAY_OF_STRING7 LONG VARCHAR FOR BIT DATA
+ CONSTRAINT AC_PK PRIMARY KEY (IDENTIFIER)
+);
+
+
+CREATE TABLE ARRAY_OF_OBJECT1
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+);
+
+CREATE TABLE ARRAY_OF_SIMPLE_CLASS3
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+);
+
+CREATE TABLE ARRAY_OF_SIMPLE_INTERFACE5
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+);
+
+CREATE TABLE ARRAY_OF_STRING7
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ STRINGVAL VARCHAR(1024)
+);
+
+CREATE TABLE ARRAY_OF_DATE9
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ DATEVAL DATE
+);
+
+CREATE TABLE ARRAY_OF_LOCALE11
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ LOCALEVAL CHAR(20)
+);
+
+CREATE TABLE ARRAY_OF_BIG_DECIMAL13
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ BIG_DECIMALVAL DECIMAL(17,6)
+);
+
+CREATE TABLE ARRAY_OF_BIG_INTEGER15
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ BIG_INTEGERVAL BIGINT
+);
+
+CREATE TABLE ARRAY_OF_BYTE17
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ BYTEVAL SMALLINT
+);
+
+CREATE TABLE ARRAY_OF_DOUBLE19
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ DOUBLEVAL DOUBLE
+);
+
+CREATE TABLE ARRAY_OF_FLOAT21
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ FLOATVAL FLOAT
+);
+
+CREATE TABLE ARRAY_OF_INTEGER23
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ INTEGERVAL INTEGER
+);
+
+CREATE TABLE ARRAY_OF_LONG25
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ LONGVAL BIGINT
+);
+
+CREATE TABLE ARRAY_OF_SHORT27
+(
+ IDENTIFIER INTEGER REFERENCES ARRAY_COLLECTIONS NOT NULL,
+ SHORTVAL SMALLINT
);
--CollectionCollections
@@ -4343,14 +4388,22 @@
INDEX INTEGER
);
-1REATE TABLE HASHSET_OF_BIG_DECIMAL20
+CREATE TABLE HASHSET_OF_BIG_DECIMAL18
+(
+ IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
+ BIG_DECIMALVAL DECIMAL(17,6),
+ INDEX INTEGER
+);
+
+
+CREATE TABLE HASHSET_OF_BIG_DECIMAL20
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
BIG_DECIMALVAL DECIMAL(17,6),
INDEX INTEGER
);
-CREATE TABLE HASHSET_OF_BIG_INTEGER23
+CREATE TABLE HASHSET_OF_BIG_INTEGER21
(
IDENTIFIER INTEGER REFERENCES HASHSET_COLLECTIONS NOT NULL,
BIG_INTEGERVAL BIGINT,