Hi,
please find the patch fixing the mismatch between ORM metadata and
schema wrt classes "CollectionCollections", "ArrayListCollections",
and "TreeMapStringKeyCollections".
Note, that the tests "TestCollectionCollections" etc. still fail.
That's why I filed a new issue (JDO-119). I changed the status to
resolved.
Regards,
Michael
Hi Andy,
Hi Michael,
you are right: The ORM metadata does not match the schema. A
while ago,
I have fixed the same issue in classes "HashXXX", "ListXXX",
"MapXXX"
etc. Obviously, I have overlooked the issue in class
"CollectionCollections". I'll fix this and I'll also check classes
"ArrayXXX".
Thanks. It's only CollectionCollections that has this problem -
I've already checked!
Actually, ArrayCollections is correct but ArrayListCollections has
the same issue. And there are two leftovers in
TreeMapStringKeyCollections. I'll send a patch today.
Regards,
Michael
Once this issue is fixed then all of the HashXXX, ListXXX,
CollectionXXX, MapXXX, ArrayListXXX will need a fix adding for
JDO-106 (I've commented the JIRA for that one with what the
problem is there).
--
-------------------------------------------------------------------
Michael Watzek [EMAIL PROTECTED] Engineering GmbH
mailto:[EMAIL PROTECTED] Buelowstr. 66
Tel.: ++49/30/235 520 36 10783 Berlin - Germany
Fax.: ++49/30/217 520 12 http://www.spree.de/
-------------------------------------------------------------------
Index: test/sql/derby/datastoreidentity/schema.sql
===================================================================
--- test/sql/derby/datastoreidentity/schema.sql (revision 232227)
+++ test/sql/derby/datastoreidentity/schema.sql (working copy)
@@ -2869,37 +2869,37 @@
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_STRING9
@@ -3315,42 +3315,42 @@
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS5
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE8
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -6881,7 +6881,7 @@
(
IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT
NULL,
KEYVAL VARCHAR(100) NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -6889,7 +6889,7 @@
(
IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT
NULL,
KEYVAL VARCHAR(100) NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
Index: test/sql/derby/applicationidentity/schema.sql
===================================================================
--- test/sql/derby/applicationidentity/schema.sql (revision 232227)
+++ test/sql/derby/applicationidentity/schema.sql (working copy)
@@ -2893,37 +2893,37 @@
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_CLASS5
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_SIMPLE_INTERFACE8
(
IDENTIFIER INTEGER REFERENCES COLLECTION_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL
);
CREATE TABLE COLLECTION_OF_STRING9
@@ -3337,42 +3337,42 @@
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS5
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE8
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -6890,7 +6890,7 @@
(
IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT
NULL,
KEYVAL VARCHAR(100) NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -6898,7 +6898,7 @@
(
IDENTIFIER INTEGER REFERENCES TREEMAPSTRINGKEY_COLLECTIONS NOT
NULL,
KEYVAL VARCHAR(100) NOT NULL,
- SIMPINTERFREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
INDEX INTEGER NOT NULL
);