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 2024/11/10 18:32:59 UTC
(db-jdo) branch JDO-844 updated: JDO-844: added code review comments from Tilmann
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch JDO-844
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
The following commit(s) were added to refs/heads/JDO-844 by this push:
new 6afe91cb JDO-844: added code review comments from Tilmann
6afe91cb is described below
commit 6afe91cb53c31a7e9803f28b955bad9ddc9363aa
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Nov 10 19:32:49 2024 +0100
JDO-844: added code review comments from Tilmann
---
.../tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java | 2 +-
.../apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java | 4 ++--
.../org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java | 4 ++--
.../apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java | 4 ++--
.../apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java | 2 +-
.../org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java | 2 +-
.../apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java | 2 +-
.../org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java | 2 +-
.../org/apache/jdo/tck/pc/company/package.jdo | 4 ++--
.../org/apache/jdo/tck/pc/company/package.jdo | 4 ++--
.../org/apache/jdo/tck/pc/company/package-standard.orm | 4 ++--
.../org/apache/jdo/tck/pc/company/package-standard1.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard2.orm | 6 +++---
.../org/apache/jdo/tck/pc/company/package-standard3.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard4.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard.orm | 4 ++--
.../org/apache/jdo/tck/pc/company/package-standard1.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard2.orm | 6 +++---
.../org/apache/jdo/tck/pc/company/package-standard3.orm | 2 +-
.../org/apache/jdo/tck/pc/company/package-standard4.orm | 2 +-
.../main/resources/sql/derby/applicationidentity/schema.sql | 4 ++--
.../main/resources/sql/derby/applicationidentity/schema1.sql | 4 ++--
.../resources/sql/derby/applicationidentity/schema11.sql | 4 ++--
.../main/resources/sql/derby/applicationidentity/schema2.sql | 12 ++++++------
.../main/resources/sql/derby/applicationidentity/schema3.sql | 4 ++--
.../main/resources/sql/derby/applicationidentity/schema4.sql | 4 ++--
.../main/resources/sql/derby/datastoreidentity/schema.sql | 4 ++--
.../main/resources/sql/derby/datastoreidentity/schema1.sql | 6 +++---
.../main/resources/sql/derby/datastoreidentity/schema11.sql | 4 ++--
.../main/resources/sql/derby/datastoreidentity/schema2.sql | 12 ++++++------
.../main/resources/sql/derby/datastoreidentity/schema3.sql | 4 ++--
.../main/resources/sql/derby/datastoreidentity/schema4.sql | 6 +++---
33 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
index 80059552..1cfd8045 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/PMsCanSharePCClassesButNotPCInstances.java
@@ -118,7 +118,7 @@ public class PMsCanSharePCClassesButNotPCInstances extends JDO_Test {
while (threads > 0) {
try {
- Thread.sleep(200);
+ Thread.sleep(100);
} catch (InterruptedException ex) {
logger.debug("interrupted while waiting for threads to finish");
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java b/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
index 9d63d0eb..7f3ee001 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/company/Person.java
@@ -280,7 +280,7 @@ public class Person
* @param languages The set of languages for this person.
*/
public void setLanguages(Set<String> languages) {
- this.languages = languages;
+ this.languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
index e39cb187..e4b7f889 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCAppPerson.java
@@ -89,7 +89,7 @@ public class FCAppPerson
@Value(types = java.lang.String.class, column = "PHONENO")
private Map<String, String> phoneNumbers = new HashMap<>();
- @Persistent(table = "employee_language")
+ @Persistent(table = "employee_languages")
@Join(column = "EMPID")
@Element(types = java.lang.String.class, column = "LANGUAGE")
private Set<String> languages = new HashSet<>();
@@ -324,7 +324,7 @@ public class FCAppPerson
* @param languages The map of phoneNumbers for this person.
*/
public void setLanguages(Set<String> languages) {
- this.languages = languages;
+ this.languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
index 367f4b21..b071a1e0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedFC/FCDSPerson.java
@@ -85,7 +85,7 @@ public class FCDSPerson
@Value(types = java.lang.String.class, column = "PHONENO")
private Map<String, String> phoneNumbers = new HashMap<>();
- @Persistent(table = "employee_language")
+ @Persistent(table = "employee_languages")
@Join(column = "EMPID")
@Element(types = java.lang.String.class, column = "LANGUAGE")
private Set<String> languages = new HashSet<>();
@@ -320,7 +320,7 @@ public class FCDSPerson
* @param languages The map of phoneNumbers for this person.
*/
public void setLanguages(Set<String> languages) {
- this.languages = languages;
+ this.languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
index 2bf919f7..7b604d10 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedJPA/JPAAppPerson.java
@@ -97,7 +97,7 @@ public class JPAAppPerson
private Map<String, JPAAppPhoneNumber> phoneNumbers = new HashMap<>();
@ElementCollection
- @CollectionTable(name = "employee_language", joinColumns = @JoinColumn(name = "EMPID"))
+ @CollectionTable(name = "employee_languages", joinColumns = @JoinColumn(name = "EMPID"))
private Set<String> languages = new HashSet<>();
/** This is the JDO-required no-args constructor. */
@@ -330,7 +330,7 @@ public class JPAAppPerson
* @param languages The map of phoneNumbers for this person.
*/
public void setLanguages(Set<String> languages) {
- this.languages = languages;
+ this.languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
index d591c29c..f873d9f0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCAppPerson.java
@@ -313,7 +313,7 @@ public class PCAppPerson
* @param languages The set of languages for this person.
*/
public void setLanguages(Set<String> languages) {
- this._languages = languages;
+ this._languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
index 2806aec1..5e52c852 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPC/PCDSPerson.java
@@ -313,7 +313,7 @@ public class PCDSPerson
* @param languages The map of phoneNumbers for this person.
*/
public void setLanguages(Set<String> languages) {
- this._languages = languages;
+ this._languages = new HashSet(languages);
}
/**
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
index b711987e..a7906286 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIAppPerson.java
@@ -87,7 +87,7 @@ public interface PIAppPerson extends IPerson {
@Value(types = java.lang.String.class, column = "PHONENO")
Map<String, String> getPhoneNumbers();
- @Persistent(persistenceModifier = PersistenceModifier.PERSISTENT, table = "employee_language")
+ @Persistent(persistenceModifier = PersistenceModifier.PERSISTENT, table = "employee_languages")
@Join(column = "EMPID")
@Element(types = java.lang.String.class, column = "LANGUAGE")
Set<String> getLanguages();
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
index 87664de3..fd8fec25 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/companyAnnotatedPI/PIDSPerson.java
@@ -85,7 +85,7 @@ public interface PIDSPerson extends IPerson {
@Value(types = java.lang.String.class, column = "PHONENO")
Map<String, String> getPhoneNumbers();
- @Persistent(table = "employee_language")
+ @Persistent(table = "employee_languages")
@Join(column = "EMPID")
@Element(types = java.lang.String.class, column = "LANGUAGE")
Set<String> getLanguages();
diff --git a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
index a4b69055..9271e0d0 100644
--- a/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
+++ b/tck/src/main/resources/jdo/applicationidentity/org/apache/jdo/tck/pc/company/package.jdo
@@ -132,7 +132,7 @@ has application identity.
<map key-type="String" value-type="String"/>
</field>
<field name="languages" persistence-modifier="persistent">
- <collection type="String"/>
+ <collection element-type="java.lang.String"/>
</field>
<query name="validNotUnique">
SELECT firstname, lastname
@@ -279,7 +279,7 @@ has application identity.
<map key-type="String" value-type="String"/>
</property>
<property name="languages" persistence-modifier="persistent">
- <collection type="String"/>
+ <collection element-type="java.lang.String"/>
</property>
<query name="validNotUnique">
SELECT firstname, lastname
diff --git a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
index 90dd5eb2..9e21bf3e 100644
--- a/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
+++ b/tck/src/main/resources/jdo/datastoreidentity/org/apache/jdo/tck/pc/company/package.jdo
@@ -107,7 +107,7 @@ has datastore identity.
<map key-type="String" value-type="String"/>
</field>
<field name="languages" persistence-modifier="persistent">
- <collection type="String"/>
+ <collection element-type="java.lang.String"/>
</field>
<query name="validNotUnique">
SELECT firstname, lastname
@@ -245,7 +245,7 @@ has datastore identity.
<map key-type="String" value-type="String"/>
</property>
<property name="languages" persistence-modifier="persistent">
- <collection type="String"/>
+ <collection element-type="java.lang.String"/>
</property>
<query name="validNotUnique">
SELECT firstname, lastname
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index bed389be..5558039d 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard.orm
@@ -150,7 +150,7 @@ has application identity.
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
@@ -318,7 +318,7 @@ has application identity.
<key column="TYPE"/>
<value column="PHONENO"/>
</property>
- <property name="languages" table="employee_language" >
+ <property name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</property>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index f5c67108..0ad8f621 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
@@ -133,7 +133,7 @@ Inheritance strategy: new-table for all classes.
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index 1c7113ef..0c9f119c 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
@@ -97,7 +97,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="Person.languages" table="parttime_employee_language" >
+ <field name="Person.languages" table="parttime_employee_languages" >
<join column="EMPID"/>
<value column="LANGUAGE"/>
</field>
@@ -151,7 +151,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="Person.languages" table="fulltime_employee_language" >
+ <field name="Person.languages" table="fulltime_employee_languages" >
<join column="EMPID"/>
<value column="LANGUAGE"/>
</field>
@@ -209,7 +209,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index 13617db8..71538499 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
@@ -133,7 +133,7 @@ MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index e86b90dc..71ae5987 100644
--- a/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
+++ b/tck/src/main/resources/orm/applicationidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
@@ -131,7 +131,7 @@ have inheritance strategy "superclass-table".
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
index 1707b6c9..4571bdd5 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard.orm
@@ -156,7 +156,7 @@ has datastore identity.
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
@@ -325,7 +325,7 @@ has datastore identity.
<key column="TYPE"/>
<value column="PHONENO"/>
</property>
- <property name="languages" table="employee_language" >
+ <property name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</property>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
index 0889948a..3d677abc 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard1.orm
@@ -140,7 +140,7 @@ Inheritance strategy: new-table for all classes.
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
index 2fd3b573..7f63f376 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard2.orm
@@ -102,7 +102,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="Person.languages" table="parttime_employee_language" >
+ <field name="Person.languages" table="parttime_employee_languages" >
<join column="EMPID"/>
<value column="LANGUAGE"/>
</field>
@@ -161,7 +161,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="fulltime_employee_language" >
+ <field name="languages" table="fulltime_employee_languages" >
<join column="EMPID"/>
<value column="LANGUAGE"/>
</field>
@@ -224,7 +224,7 @@ Inheritance strategy:
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
index cc86dca9..6c97e05e 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard3.orm
@@ -140,7 +140,7 @@ MedicalInsurance and DentalInsurance have inheritance strategy "new-table".
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
index cceed043..9632de4b 100644
--- a/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
+++ b/tck/src/main/resources/orm/datastoreidentity/org/apache/jdo/tck/pc/company/package-standard4.orm
@@ -138,7 +138,7 @@ have inheritance strategy "superclass-table".
<key column="TYPE"/>
<value column="PHONENO"/>
</field>
- <field name="languages" table="employee_language" >
+ <field name="languages" table="employee_languages" >
<join column="EMPID"/>
<element column="LANGUAGE"/>
</field>
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
index 9eb07db8..183df4b3 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema.sql
@@ -292,7 +292,7 @@ DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
DROP TABLE project_member_jpa;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE persons;
DROP TABLE projects;
@@ -408,7 +408,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema1.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema1.sql
index 815b9ed4..07ee5bcd 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema1.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema1.sql
@@ -38,7 +38,7 @@ DROP TABLE medicalinsurance;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltimeemployees;
DROP TABLE parttimeemployees;
@@ -169,7 +169,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema11.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema11.sql
index aaf01e75..8142b632 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema11.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema11.sql
@@ -37,7 +37,7 @@ ALTER TABLE insuranceplans DROP CONSTRAINT INS_EMP_FK;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE persons;
DROP TABLE projects;
@@ -148,7 +148,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema2.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema2.sql
index a57af0a3..b7c60037 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema2.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema2.sql
@@ -45,9 +45,9 @@ DROP TABLE dentalinsurance;
DROP TABLE medicalinsurance;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
-DROP TABLE fulltime_employee_language;
-DROP TABLE parttime_employee_language;
+DROP TABLE employee_languages;
+DROP TABLE fulltime_employee_languages;
+DROP TABLE parttime_employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltime_employee_phoneno_type;
DROP TABLE parttime_employee_phoneno_type;
@@ -205,17 +205,17 @@ CREATE TABLE parttime_employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language(
+CREATE TABLE employee_languages(
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
-CREATE TABLE fulltime_employee_language (
+CREATE TABLE fulltime_employee_languages (
EMPID INTEGER REFERENCES fulltimeemployees NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
-CREATE TABLE parttime_employee_language (
+CREATE TABLE parttime_employee_languages (
EMPID INTEGER REFERENCES parttimeemployees NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema3.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema3.sql
index 3138b82a..fa9aa786 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema3.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema3.sql
@@ -40,7 +40,7 @@ DROP TABLE dentalinsurance;
DROP TABLE medicalinsurance;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltimeemployees;
DROP TABLE parttimeemployees;
@@ -166,7 +166,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/applicationidentity/schema4.sql b/tck/src/main/resources/sql/derby/applicationidentity/schema4.sql
index 85a7b617..0feaf074 100644
--- a/tck/src/main/resources/sql/derby/applicationidentity/schema4.sql
+++ b/tck/src/main/resources/sql/derby/applicationidentity/schema4.sql
@@ -36,7 +36,7 @@ ALTER TABLE project_reviewer DROP CONSTRAINT PR_REV_FK;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE employees;
DROP TABLE persons;
@@ -143,7 +143,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) 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 59027116..6ee1db20 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema.sql
@@ -226,7 +226,7 @@ ALTER TABLE insuranceplans DROP CONSTRAINT INS_EMP_FK;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE persons;
DROP TABLE projects;
@@ -345,7 +345,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema1.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema1.sql
index caa0f198..787cec1b 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema1.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema1.sql
@@ -38,7 +38,7 @@ DROP TABLE medicalinsurance;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltimeemployees;
DROP TABLE parttimeemployees;
@@ -198,10 +198,10 @@ CREATE TABLE employee_phoneno_type (
REFERENCES persons (DATASTORE_IDENTITY)
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
- CONSTRAINT employee_language_EMPID FOREIGN KEY (EMPID)
+ CONSTRAINT employee_languages_EMPID FOREIGN KEY (EMPID)
REFERENCES persons (DATASTORE_IDENTITY)
);
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema11.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema11.sql
index dca8041e..1b05c925 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema11.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema11.sql
@@ -37,7 +37,7 @@ ALTER TABLE insuranceplans DROP CONSTRAINT INS_EMP_FK;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE persons;
DROP TABLE projects;
@@ -156,7 +156,7 @@ CREATE TABLE employee_phoneno_type (
TYPE VARCHAR(16) NOT NULL
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER REFERENCES persons NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL
);
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema2.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema2.sql
index 0f8ad976..f7c799d0 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema2.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema2.sql
@@ -45,9 +45,9 @@ DROP TABLE dentalinsurance;
DROP TABLE medicalinsurance;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
-DROP TABLE fulltime_employee_language;
-DROP TABLE parttime_employee_language;
+DROP TABLE employee_languages;
+DROP TABLE fulltime_employee_languages;
+DROP TABLE parttime_employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltime_employee_phoneno_type;
DROP TABLE parttime_employee_phoneno_type;
@@ -250,21 +250,21 @@ CREATE TABLE parttime_employee_phoneno_type (
REFERENCES parttimeemployees (DATASTORE_IDENTITY)
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
CONSTRAINT EMP_LANGUAGE_PERSONS FOREIGN KEY (EMPID)
REFERENCES persons (DATASTORE_IDENTITY)
);
-CREATE TABLE fulltime_employee_language (
+CREATE TABLE fulltime_employee_languages (
EMPID INTEGER NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
CONSTRAINT FTEMP_LANGUAGE_FTEMP FOREIGN KEY (EMPID)
REFERENCES fulltimeemployees (DATASTORE_IDENTITY)
);
-CREATE TABLE parttime_employee_language (
+CREATE TABLE parttime_employee_languages (
EMPID INTEGER REFERENCES parttimeemployees NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
CONSTRAINT PTEMP_LANGUAGE_PTEMP FOREIGN KEY (EMPID)
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema3.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema3.sql
index 62b16e96..478735d9 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema3.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema3.sql
@@ -40,7 +40,7 @@ DROP TABLE dentalinsurance;
DROP TABLE medicalinsurance;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE fulltimeemployees;
DROP TABLE parttimeemployees;
@@ -205,7 +205,7 @@ CREATE TABLE employee_phoneno_type (
REFERENCES persons (DATASTORE_IDENTITY)
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
CONSTRAINT EMP_LANGUAGE_PERSONS FOREIGN KEY (EMPID)
diff --git a/tck/src/main/resources/sql/derby/datastoreidentity/schema4.sql b/tck/src/main/resources/sql/derby/datastoreidentity/schema4.sql
index 95be9afc..1e960295 100644
--- a/tck/src/main/resources/sql/derby/datastoreidentity/schema4.sql
+++ b/tck/src/main/resources/sql/derby/datastoreidentity/schema4.sql
@@ -36,7 +36,7 @@ ALTER TABLE project_reviewer DROP CONSTRAINT PR_REV_FK;
DROP TABLE insuranceplans;
DROP TABLE project_reviewer;
DROP TABLE project_member;
-DROP TABLE employee_language;
+DROP TABLE employee_languages;
DROP TABLE employee_phoneno_type;
DROP TABLE employees;
DROP TABLE persons;
@@ -168,10 +168,10 @@ CREATE TABLE employee_phoneno_type (
REFERENCES persons (DATASTORE_IDENTITY)
);
-CREATE TABLE employee_language (
+CREATE TABLE employee_languages (
EMPID INTEGER NOT NULL,
LANGUAGE VARCHAR(255) NOT NULL,
- CONSTRAINT employee_language_EMPID FOREIGN KEY (EMPID)
+ CONSTRAINT employee_languages_EMPID FOREIGN KEY (EMPID)
REFERENCES persons (DATASTORE_IDENTITY)
);