Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2011-12-05 20:43:41 +0000
committerMartin Taal2011-12-05 20:43:41 +0000
commit3f4b1cf30440b375770f5e66d2a690a92bebb186 (patch)
tree556750925e3e9b61323041bc26bac41937df90dc /tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations
parent3c72cc9219423c643a7b04fb11e3d9c7d53abccd (diff)
downloadorg.eclipse.emf.teneo-3f4b1cf30440b375770f5e66d2a690a92bebb186.tar.gz
org.eclipse.emf.teneo-3f4b1cf30440b375770f5e66d2a690a92bebb186.tar.xz
org.eclipse.emf.teneo-3f4b1cf30440b375770f5e66d2a690a92bebb186.zip
Fixes issue [359802] - Uniqueness validation for constraints when using mappedsuperclass
Diffstat (limited to 'tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations')
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml4
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml4
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml4
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml21
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml24
5 files changed, 51 insertions, 6 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 2afd83c24..cf047b6cd 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -31,7 +31,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="EMPLOYEE_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`EMPLOYEE_ADDRESS_ID`"/>
</many-to-one>
<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
@@ -50,7 +50,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="STUDENT_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`ADDRESS_ADDRESS_E_ID`"/>
</many-to-one>
<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index c6397590f..cdfea1541 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -37,7 +37,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="EMPLOYEE_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`EMPLOYEE_ADDRESS_ID`"/>
</many-to-one>
<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
@@ -59,7 +59,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="STUDENT_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`ADDRESS_ADDRESS_E_ID`"/>
</many-to-one>
<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
index c6397590f..cdfea1541 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml
@@ -37,7 +37,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="EMPLOYEE_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`EMPLOYEE_ADDRESS_ID`"/>
</many-to-one>
<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
@@ -59,7 +59,7 @@
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
- <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="PERSON_ADDRESS" insert="true" update="true" not-null="false">
+ <many-to-one name="address" entity-name="Address" lazy="false" cascade="all" foreign-key="STUDENT_ADDRESS" insert="true" update="true" not-null="false">
<column not-null="false" unique="false" name="`ADDRESS_ADDRESS_E_ID`"/>
</many-to-one>
<property name="faculty" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
index 20056a39d..19d05d740 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml
@@ -16,6 +16,9 @@
<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`MYGENERICINFO`"/>
</property>
+ <many-to-one name="myTestReference" entity-name="TestReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDIDDOCUMENT_MYTESTREFERENCE" insert="true" update="true" not-null="true">
+ <column not-null="true" unique="false" name="`TESTREFERENCE_MYTESTREFERENCE_E_ID`"/>
+ </many-to-one>
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
@@ -34,6 +37,9 @@
<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`MYGENERICINFO`"/>
</property>
+ <many-to-one name="myTestReference" entity-name="TestReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICDOCUMENT_MYTESTREFERENCE" insert="true" update="true" not-null="true">
+ <column not-null="true" unique="false" name="`TESTREFERENCE_MYTESTREFERENCE_E_ID`"/>
+ </many-to-one>
<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`PARENTDOCUMENT_NAME`" length="50"/>
</property>
@@ -41,4 +47,19 @@
<column not-null="true" unique="false" name="`MYSPECIFICINFO`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.TestReferenceImpl" entity-name="TestReference" abstract="false" lazy="false" table="`TESTREFERENCE`">
+ <meta attribute="eclassName" inherit="false">TestReference</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+ <cache usage="read-write"/>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
index fdbe8694f..38386ef96 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml
@@ -19,6 +19,9 @@
<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`MYGENERICINFO`"/>
</property>
+ <many-to-one name="myTestReference" entity-name="TestReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDIDDOCUMENT_MYTESTREFERENCE" insert="true" update="true" not-null="true">
+ <column not-null="true" unique="false" name="`TESTREFERENCE_MYTESTREFERENCE_E_ID`"/>
+ </many-to-one>
<property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`NAME`"/>
</property>
@@ -40,6 +43,9 @@
<property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="true" unique="false" name="`MYGENERICINFO`"/>
</property>
+ <many-to-one name="myTestReference" entity-name="TestReference" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICDOCUMENT_MYTESTREFERENCE" insert="true" update="true" not-null="true">
+ <column not-null="true" unique="false" name="`TESTREFERENCE_MYTESTREFERENCE_E_ID`"/>
+ </many-to-one>
<property name="myName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`PARENTDOCUMENT_NAME`" length="50"/>
</property>
@@ -47,4 +53,22 @@
<column not-null="true" unique="false" name="`MYSPECIFICINFO`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.mappedsuperclass.impl.TestReferenceImpl" entity-name="TestReference" abstract="false" lazy="false" discriminator-value="TestReference" table="`TESTREFERENCE`">
+ <meta attribute="eclassName" inherit="false">TestReference</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclass</meta>
+ <cache usage="read-write"/>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <discriminator type="string">
+ <column name="`DTYPE`" index="TESTREFERENCEDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
</hibernate-mapping> \ No newline at end of file

Back to the top