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 mb...@apache.org on 2022/04/09 18:09:40 UTC
[db-jdo] branch main updated: Fix orm/sql files for ArrayListCollections/TreeSetCollections so that they map embedded fields correctly (#42)
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
The following commit(s) were added to refs/heads/main by this push:
new c2ae74ab Fix orm/sql files for ArrayListCollections/TreeSetCollections so that they map embedded fields correctly (#42)
c2ae74ab is described below
commit c2ae74ab0b393786962106961d291d2254ba531c
Author: Andy Jefferson <an...@datanucleus.org>
AuthorDate: Sat Apr 9 19:09:35 2022 +0100
Fix orm/sql files for ArrayListCollections/TreeSetCollections so that they map embedded fields correctly (#42)
* Update orm/sql for ArrayList/TreeSet samples to define embedded collection element fields consistent with other tests
* Remove Eclipse added line
---
.gitignore | 1 -
.../fieldtypes/ArrayListCollections-standard.orm | 24 +++++++++++++++++---
.../pc/fieldtypes/TreeSetCollections-standard.orm | 24 +++++++++++++++++---
.../fieldtypes/ArrayListCollections-standard.orm | 24 +++++++++++++++++---
.../pc/fieldtypes/TreeSetCollections-standard.orm | 24 +++++++++++++++++---
.../sql/derby/applicationidentity/schema.sql | 26 ++++++++++++++++------
.../sql/derby/datastoreidentity/schema.sql | 24 +++++++++++++++-----
7 files changed, 121 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
index f428fc9c..9ae45758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,3 @@ lib
query.ser
datanucleus.txt
tck.txt
-
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 70d0cf39..16721e5e 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
@@ -31,7 +31,13 @@
<field name="ArrayListOfObject1"
table="ARRAYLIST_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfObject2"
@@ -49,7 +55,13 @@
<field name="ArrayListOfSimpleClass4"
table="ARRAYLIST_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleClass5"
@@ -67,7 +79,13 @@
<field name="ArrayListOfSimpleInterface7"
table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleInterface8"
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index 58c9dae5..fe277114 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
@@ -29,7 +29,13 @@
</field>
<field name="TreeSetOfObject1" table="TREESET_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfObject2" table="TREESET_OF_OBJECT2">
@@ -44,7 +50,13 @@
</field>
<field name="TreeSetOfSimpleClass4" table="TREESET_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfSimpleClass5" table="TREESET_OF_SIMPLE_CLASS5">
@@ -59,7 +71,13 @@
</field>
<field name="TreeSetOfSimpleInterface7" table="TREESET_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfSimpleInterface8" table="TREESET_OF_SIMPLE_INTERFACE8">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
index 624b4763..2e035dd0 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/ArrayListCollections-standard.orm
@@ -30,7 +30,13 @@
</field>
<field name="ArrayListOfObject1" table="ARRAYLIST_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfObject2" table="ARRAYLIST_OF_OBJECT2">
@@ -45,7 +51,13 @@
</field>
<field name="ArrayListOfSimpleClass4" table="ARRAYLIST_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleClass5" table="ARRAYLIST_OF_SIMPLE_CLASS5">
@@ -60,7 +72,13 @@
</field>
<field name="ArrayListOfSimpleInterface7" table="ARRAYLIST_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="ArrayListOfSimpleInterface8" table="ARRAYLIST_OF_SIMPLE_INTERFACE8">
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
index 0d25b522..7a41bc29 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/fieldtypes/TreeSetCollections-standard.orm
@@ -30,7 +30,13 @@
</field>
<field name="TreeSetOfObject1" table="TREESET_OF_OBJECT1">
<join column="IDENTIFIER"/>
- <element column="OBJREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfObject2" table="TREESET_OF_OBJECT2">
@@ -45,7 +51,13 @@
</field>
<field name="TreeSetOfSimpleClass4" table="TREESET_OF_SIMPLE_CLASS4">
<join column="IDENTIFIER"/>
- <element column="SIMPCLSREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfSimpleClass5" table="TREESET_OF_SIMPLE_CLASS5">
@@ -60,7 +72,13 @@
</field>
<field name="TreeSetOfSimpleInterface7" table="TREESET_OF_SIMPLE_INTERFACE7">
<join column="IDENTIFIER"/>
- <element column="SIMPINTREF"/>
+ <element>
+ <embedded>
+ <field name="id" column="ID"/>
+ <field name="intField" column="INTVAL"/>
+ <field name="stringField" column="STRINGVAL"/>
+ </embedded>
+ </element>
<order column="INDEX"/>
</field>
<field name="TreeSetOfSimpleInterface8" table="TREESET_OF_SIMPLE_INTERFACE8">
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
index 52b08fcc..be1546b1 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
@@ -4106,8 +4106,10 @@ CREATE TABLE ARRAYLIST_OF_OBJECT0
CREATE TABLE ARRAYLIST_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
- INDEX INTEGER NOT NULL
+ INDEX INTEGER NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL
);
CREATE TABLE ARRAYLIST_OF_OBJECT2
@@ -4127,7 +4129,9 @@ CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -4148,7 +4152,9 @@ CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5249,7 +5255,9 @@ CREATE TABLE TREESET_OF_OBJECT0
CREATE TABLE TREESET_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5270,7 +5278,9 @@ CREATE TABLE TREESET_OF_SIMPLE_CLASS3
CREATE TABLE TREESET_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5291,7 +5301,9 @@ CREATE TABLE TREESET_OF_SIMPLE_INTERFACE6
CREATE TABLE TREESET_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql
index 9fe42c64..c69106b1 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql
@@ -4082,7 +4082,9 @@ CREATE TABLE ARRAYLIST_OF_OBJECT0
CREATE TABLE ARRAYLIST_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -4103,7 +4105,9 @@ CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS3
CREATE TABLE ARRAYLIST_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -4124,7 +4128,9 @@ CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE6
CREATE TABLE ARRAYLIST_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES ARRAYLIST_COLLECTIONS NOT NULL,
- SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5230,7 +5236,9 @@ CREATE TABLE TREESET_OF_OBJECT0
CREATE TABLE TREESET_OF_OBJECT1
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- OBJREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5251,7 +5259,9 @@ CREATE TABLE TREESET_OF_SIMPLE_CLASS3
CREATE TABLE TREESET_OF_SIMPLE_CLASS4
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- SIMPCLSREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);
@@ -5272,7 +5282,9 @@ CREATE TABLE TREESET_OF_SIMPLE_INTERFACE6
CREATE TABLE TREESET_OF_SIMPLE_INTERFACE7
(
IDENTIFIER INTEGER REFERENCES TREESET_COLLECTIONS NOT NULL,
- SIMPINTREF BIGINT REFERENCES SIMPLE_CLASS NOT NULL,
+ ID BIGINT NOT NULL,
+ INTVAL INTEGER NOT NULL,
+ STRINGVAL VARCHAR(128) NOT NULL,
INDEX INTEGER NOT NULL
);