Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2012-11-19 00:18:03 +0000
committerMartin Taal2012-11-19 00:18:03 +0000
commit5ffe2f7d2107eb787a339442eda7af88db3f7e56 (patch)
tree4bf47379e7973f31758804fb7980fa1617ad22bb /tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations
parentc2589b7076d2e1cabd099fd2883bdb5416d22f01 (diff)
downloadorg.eclipse.emf.teneo-5ffe2f7d2107eb787a339442eda7af88db3f7e56.tar.gz
org.eclipse.emf.teneo-5ffe2f7d2107eb787a339442eda7af88db3f7e56.tar.xz
org.eclipse.emf.teneo-5ffe2f7d2107eb787a339442eda7af88db3f7e56.zip
Also let auditing use the inheritance structure
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.xml120
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml120
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/AssociationOverrideAction_hsqldb_x_o_hibernate.hbm.xml34
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml119
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml119
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml70
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml70
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml344
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml344
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml80
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml344
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml344
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml80
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_e_o_hibernate.hbm.xml196
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_h_o_hibernate.hbm.xml196
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_e_o_hibernate.hbm.xml175
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/MappedSuperClassAction_hsqldb_h_o_hibernate.hbm.xml175
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml139
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml139
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_e_o_hibernate.hbm.xml56
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_h_o_hibernate.hbm.xml56
21 files changed, 240 insertions, 3080 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 5a5fbbf9d..95255e298 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
@@ -123,61 +123,6 @@
<column not-null="false" unique="false" name="`POSTALCODE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" table="`EMPLOYEEAUDITING`">
- <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="EMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DEPARTMENT`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" table="`PERSONAUDITING`">
<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
@@ -230,59 +175,18 @@
<column not-null="false" unique="false" name="`ADDRESS`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" table="`STUDENTAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`EMPLOYEEAUDITING`">
+ <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`STUDENTAUDITING`">
<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STUDENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FACULTY`"/>
- </property>
- </class>
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
</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/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 efeaef002..1ef8658fe 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
@@ -138,64 +138,6 @@
<column not-null="false" unique="false" name="`POSTALCODE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" discriminator-value="EmployeeAuditing" table="`EMPLOYEEAUDITING`">
- <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="EMPLOYEEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="EMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DEPARTMENT`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" discriminator-value="PersonAuditing" table="`PERSONAUDITING`">
<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
@@ -251,62 +193,12 @@
<column not-null="false" unique="false" name="`ADDRESS`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" discriminator-value="StudentAuditing" table="`STUDENTAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
+ <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="StudentAuditing">
<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="STUDENTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STUDENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FACULTY`"/>
- </property>
- </class>
+ </subclass>
</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/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 4821e838d..9dc925563 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
@@ -154,22 +154,6 @@
<column not-null="false" unique="false" name="`POSTALCODE`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="EmployeeAuditing">
- <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="department" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DEPARTMENT`"/>
- </property>
- </subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="PersonAuditing">
<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
@@ -183,20 +167,12 @@
<column not-null="false" unique="false" name="`ADDRESS`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="StudentAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
+ <meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="StudentAuditing">
<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverrideAuditing</meta>
- <property name="id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`ID`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS`"/>
- </property>
- <property name="faculty" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FACULTY`"/>
- </property>
</subclass>
</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/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
index eff2cb762..ea292217f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_e_o_hibernate.hbm.xml
@@ -58,111 +58,6 @@
<column not-null="false" unique="false" name="`COMMENT`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" table="`PARENTAUDITING`">
- <meta attribute="eclassName" inherit="false">ParentAuditing</meta>
- <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PARENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FIRSTNAME`"/>
- </property>
- <property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`LASTNAME`"/>
- </property>
- <list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
- <key update="true">
- <column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" table="`CHILDAUDITING`">
- <meta attribute="eclassName" inherit="false">ChildAuditing</meta>
- <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FIRSTNAME`"/>
- </property>
- <property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`LASTNAME`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" table="`PERSONAUDITING`">
<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
@@ -212,4 +107,18 @@
<column not-null="false" unique="false" name="`LASTNAME`"/>
</property>
</class>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`PARENTAUDITING`">
+ <meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+ <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`CHILDAUDITING`">
+ <meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+ <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
</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/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
index 2312bc2d1..ab2a090a0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/CompositeIdAction_hsqldb_h_o_hibernate.hbm.xml
@@ -56,117 +56,6 @@
<column not-null="false" unique="false" name="`COMMENT`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" discriminator-value="ParentAuditing" table="`PARENTAUDITING`">
- <meta attribute="eclassName" inherit="false">ParentAuditing</meta>
- <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="PARENTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PARENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FIRSTNAME`"/>
- </property>
- <property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`LASTNAME`"/>
- </property>
- <list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
- <key update="true">
- <column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" discriminator-value="ChildAuditing" table="`CHILDAUDITING`">
- <meta attribute="eclassName" inherit="false">ChildAuditing</meta>
- <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="CHILDAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="firstName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`FIRSTNAME`"/>
- </property>
- <property name="lastName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`LASTNAME`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PersonAuditing" abstract="false" lazy="false" discriminator-value="PersonAuditing" table="`PERSONAUDITING`">
<meta attribute="eclassName" inherit="false">PersonAuditing</meta>
<meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
@@ -219,4 +108,12 @@
<column not-null="false" unique="false" name="`LASTNAME`"/>
</property>
</class>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ParentAuditing">
+ <meta attribute="eclassName" inherit="false">ParentAuditing</meta>
+ <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="ChildAuditing">
+ <meta attribute="eclassName" inherit="false">ChildAuditing</meta>
+ <meta attribute="epackage" inherit="false">http:///org/elver/samples/emf/annotations/compositeid.ecoreAuditing</meta>
+ </subclass>
</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/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
index 4a3619a3e..1917f6a21 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_e_o_hibernate.hbm.xml
@@ -165,73 +165,13 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AnotherEmbeddableAuditing" abstract="false" lazy="false" table="`ANOTHEREMBEDDABLEAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AnotherEmbeddableAuditing" abstract="false" lazy="false" extends="AlsoEmbeddableAuditing" table="`ANOTHEREMBEDDABLEAUDITING`">
<meta attribute="eclassName" inherit="false">AnotherEmbeddableAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ANOTHEREMBEDDABLEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="anotherName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ANOTHERNAME`"/>
- </property>
- <list name="aOneToMany" lazy="true" cascade="persist,merge,refresh,save-update,lock">
- <key update="true">
- <column name="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_IDX`"/>
- <composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
- <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>
- </composite-element>
- </list>
- <component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
- <meta attribute="eclassName" inherit="false">NestedEmbeddable</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
- <property name="nestedName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
- <column not-null="true" unique="false" name="`NESTEDEMBEDDED_NESTEDNAME`"/>
- </property>
- </component>
- </class>
+ <key>
+ <column name="`ALSOEMBEDDABLEAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AOneToManyAuditing" abstract="false" lazy="false" table="`AONETOMANYAUDITING`">
<meta attribute="eclassName" inherit="false">AOneToManyAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
index e127e6c46..95fd7048a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/EmbeddedAction_hsqldb_h_o_hibernate.hbm.xml
@@ -174,76 +174,10 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AnotherEmbeddableAuditing" abstract="false" lazy="false" discriminator-value="AnotherEmbeddableAuditing" table="`ANOTHEREMBEDDABLEAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AnotherEmbeddableAuditing" abstract="false" lazy="false" extends="AlsoEmbeddableAuditing" discriminator-value="AnotherEmbeddableAuditing">
<meta attribute="eclassName" inherit="false">AnotherEmbeddableAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="ANOTHEREMBEDDABLEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ANOTHEREMBEDDABLEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="anotherName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ANOTHERNAME`"/>
- </property>
- <list name="aOneToMany" lazy="true" cascade="persist,merge,refresh,save-update,lock">
- <key update="true">
- <column name="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`ANOTHEREMBEDDABLEAUDITING_AONETOMANY_IDX`"/>
- <composite-element class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.AOneToManyImpl">
- <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>
- </composite-element>
- </list>
- <component name="nestedEmbedded" class="org.eclipse.emf.teneo.samples.emf.annotations.embedded.impl.NestedEmbeddableImpl">
- <meta attribute="eclassName" inherit="false">NestedEmbeddable</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embedded</meta>
- <property name="nestedName" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
- <column not-null="true" unique="false" name="`NESTEDEMBEDDED_NESTEDNAME`"/>
- </property>
- </component>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AOneToManyAuditing" abstract="false" lazy="false" discriminator-value="AOneToManyAuditing" table="`AONETOMANYAUDITING`">
<meta attribute="eclassName" inherit="false">AOneToManyAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
index 2209172ee..055278bd1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_e_o_hibernate.hbm.xml
@@ -303,116 +303,20 @@
<element type="java.lang.String"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" table="`DISTRICTUKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`UKADDRESSAUDITING`">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DISTRICTUKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" table="`INTERNATIONALPRICEAUDITING`">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ <key>
+ <column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="INTERNATIONALPRICEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
- </class>
+ <key>
+ <column name="`UKADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" table="`PRICEAUDITING`">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -462,124 +366,20 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" table="`UKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" table="`INTERNATIONALPRICEAUDITING`">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="UKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" table="`USADDRESSAUDITING`">
+ <key>
+ <column name="`PRICEAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`USADDRESSAUDITING`">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="USADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
- </class>
+ <key>
+ <column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" table="`CUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -626,55 +426,13 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" table="`SPECIFICCUSTOMERAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" table="`SPECIFICCUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICCUSTOMERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
- </class>
+ <key>
+ <column name="`CUSTOMERAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" table="`UKADDRESSLISTAUDITING`">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -814,47 +572,11 @@
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" table="`CHILDONEAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" table="`CHILDONEAUDITING`">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDONEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- </class>
+ <key>
+ <column name="`PARENTONEAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
</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/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
index 073748a72..b5f8930a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_h_o_hibernate.hbm.xml
@@ -321,122 +321,14 @@
<element type="java.lang.String"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" discriminator-value="DistrictUKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="DISTRICTUKADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DISTRICTUKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" discriminator-value="InternationalPriceAuditing" table="`INTERNATIONALPRICEAUDITING`">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="INTERNATIONALPRICEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="INTERNATIONALPRICEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" discriminator-value="PriceAuditing" table="`PRICEAUDITING`">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -489,130 +381,14 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" discriminator-value="UKAddressAuditing" table="`UKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="UKADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="UKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" discriminator-value="USAddressAuditing" table="`USADDRESSAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="USADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="USADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" discriminator-value="CustomerAuditing" table="`CUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -662,58 +438,10 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" discriminator-value="SpecificCustomerAuditing" table="`SPECIFICCUSTOMERAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SPECIFICCUSTOMERAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICCUSTOMERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" discriminator-value="UKAddressListAuditing" table="`UKADDRESSLISTAUDITING`">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -862,50 +590,8 @@
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" discriminator-value="ChildOneAuditing" table="`CHILDONEAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" discriminator-value="ChildOneAuditing">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="CHILDONEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDONEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- </class>
+ </subclass>
</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/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
index c3b814b28..7f62b5530 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationAction_hsqldb_x_o_hibernate.hbm.xml
@@ -306,37 +306,13 @@
<element type="java.lang.String"/>
</list>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="DistrictUKAddressAuditing">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="InternationalPriceAuditing">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="PriceAuditing">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -348,45 +324,13 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressAuditing">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="USAddressAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="CustomerAuditing">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -395,15 +339,9 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="SpecificCustomerAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressListAuditing">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
@@ -427,7 +365,7 @@
<meta attribute="eclassName" inherit="false">ParentTwoAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="ChildOneAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" discriminator-value="ChildOneAuditing">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
index 2209172ee..055278bd1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_e_o_hibernate.hbm.xml
@@ -303,116 +303,20 @@
<element type="java.lang.String"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" table="`DISTRICTUKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`UKADDRESSAUDITING`">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DISTRICTUKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" table="`INTERNATIONALPRICEAUDITING`">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ <key>
+ <column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="INTERNATIONALPRICEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
- </class>
+ <key>
+ <column name="`UKADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" table="`PRICEAUDITING`">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -462,124 +366,20 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" table="`UKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" table="`INTERNATIONALPRICEAUDITING`">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="UKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" table="`USADDRESSAUDITING`">
+ <key>
+ <column name="`PRICEAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" table="`USADDRESSAUDITING`">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="USADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
- </class>
+ <key>
+ <column name="`ADDRESSAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" table="`CUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -626,55 +426,13 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" table="`SPECIFICCUSTOMERAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" table="`SPECIFICCUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICCUSTOMERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
- </class>
+ <key>
+ <column name="`CUSTOMERAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" table="`UKADDRESSLISTAUDITING`">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -814,47 +572,11 @@
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" table="`CHILDONEAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" table="`CHILDONEAUDITING`">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDONEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- </class>
+ <key>
+ <column name="`PARENTONEAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
</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/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
index 073748a72..b5f8930a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_h_o_hibernate.hbm.xml
@@ -321,122 +321,14 @@
<element type="java.lang.String"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" discriminator-value="DistrictUKAddressAuditing" table="`DISTRICTUKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="DISTRICTUKADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DISTRICTUKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" discriminator-value="InternationalPriceAuditing" table="`INTERNATIONALPRICEAUDITING`">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="INTERNATIONALPRICEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="INTERNATIONALPRICEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" discriminator-value="PriceAuditing" table="`PRICEAUDITING`">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -489,130 +381,14 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" discriminator-value="UKAddressAuditing" table="`UKADDRESSAUDITING`">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="UKADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="UKADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" discriminator-value="USAddressAuditing" table="`USADDRESSAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="USADDRESSAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="USADDRESSAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" discriminator-value="CustomerAuditing" table="`CUSTOMERAUDITING`">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -662,58 +438,10 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" discriminator-value="SpecificCustomerAuditing" table="`SPECIFICCUSTOMERAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SPECIFICCUSTOMERAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICCUSTOMERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" discriminator-value="UKAddressListAuditing" table="`UKADDRESSLISTAUDITING`">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
@@ -862,50 +590,8 @@
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" discriminator-value="ChildOneAuditing" table="`CHILDONEAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" discriminator-value="ChildOneAuditing">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="CHILDONEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDONEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- </class>
+ </subclass>
</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/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
index 74d1598cb..d928ff6d0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/InheritanceAnnotationTablePerClassAction_hsqldb_x_o_hibernate.hbm.xml
@@ -299,37 +299,13 @@
<element type="java.lang.String"/>
</list>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="DistrictUKAddressAuditing">
- <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="UKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
- <property name="district" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`DISTRICT`"/>
- </property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="InternationalPriceAuditing">
- <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DistrictUKAddressAuditing" abstract="false" lazy="false" extends="UKAddressAuditing" discriminator-value="DistrictUKAddressAuditing">
+ <meta attribute="eclassName" inherit="false">DistrictUKAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
- <column not-null="false" unique="false" name="`VALUE`"/>
- </property>
- <property name="currency" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CURRENCY`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PriceAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="PriceAuditing">
<meta attribute="eclassName" inherit="false">PriceAuditing</meta>
@@ -341,45 +317,13 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressAuditing">
- <meta attribute="eclassName" inherit="false">UKAddressAuditing</meta>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="InternationalPriceAuditing" abstract="false" lazy="false" extends="PriceAuditing" discriminator-value="InternationalPriceAuditing">
+ <meta attribute="eclassName" inherit="false">InternationalPriceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="postcode" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`POSTCODE`"/>
- </property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="USAddressAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="USAddressAuditing" abstract="false" lazy="false" extends="AddressAuditing" discriminator-value="USAddressAuditing">
<meta attribute="eclassName" inherit="false">USAddressAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`CITY`"/>
- </property>
- <property name="state" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`STATE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param>
- <param name="eclassifier">USState</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param>
- </type>
- </property>
- <property name="zip" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigInteger">
- <column not-null="false" unique="false" name="`ZIP`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="CustomerAuditing">
<meta attribute="eclassName" inherit="false">CustomerAuditing</meta>
@@ -388,15 +332,9 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="SpecificCustomerAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificCustomerAuditing" abstract="false" lazy="false" extends="CustomerAuditing" discriminator-value="SpecificCustomerAuditing">
<meta attribute="eclassName" inherit="false">SpecificCustomerAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="specificName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`SPECIFICNAME`"/>
- </property>
</subclass>
<subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="UKAddressListAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="UKAddressListAuditing">
<meta attribute="eclassName" inherit="false">UKAddressListAuditing</meta>
@@ -420,7 +358,7 @@
<meta attribute="eclassName" inherit="false">ParentTwoAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
</subclass>
- <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="TeneoAuditEntry" discriminator-value="ChildOneAuditing">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildOneAuditing" abstract="false" lazy="false" extends="ParentOneAuditing" discriminator-value="ChildOneAuditing">
<meta attribute="eclassName" inherit="false">ChildOneAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemappingAuditing</meta>
</subclass>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_e_o_hibernate.hbm.xml
index f5ac96c92..785f0ab18 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_e_o_hibernate.hbm.xml
@@ -113,144 +113,27 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubAuditing" abstract="false" lazy="false" table="`SUBAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubAuditing" abstract="false" lazy="false" extends="SuperAuditing" table="`SUBAUDITING`">
<meta attribute="eclassName" inherit="false">SubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="OtherSubAuditing" abstract="false" lazy="false" table="`OTHERSUBAUDITING`">
+ <key>
+ <column name="`SUPERAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="OtherSubAuditing" abstract="false" lazy="false" extends="SuperAuditing" table="`OTHERSUBAUDITING`">
<meta attribute="eclassName" inherit="false">OtherSubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="OTHERSUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AbstractSubAuditing" abstract="false" lazy="false" table="`ABSTRACTSUBAUDITING`">
+ <key>
+ <column name="`SUPERAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AbstractSubAuditing" abstract="false" lazy="false" extends="SuperAuditing" table="`ABSTRACTSUBAUDITING`">
<meta attribute="eclassName" inherit="false">AbstractSubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ABSTRACTSUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
+ <key>
+ <column name="`SUPERAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SuperFormulaAuditing" abstract="false" lazy="false" table="`SUPERFORMULAAUDITING`">
<meta attribute="eclassName" inherit="false">SuperFormulaAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
@@ -297,50 +180,11 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubFormulaAuditing" abstract="false" lazy="false" table="`SUBFORMULAAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubFormulaAuditing" abstract="false" lazy="false" extends="SuperFormulaAuditing" table="`SUBFORMULAAUDITING`">
<meta attribute="eclassName" inherit="false">SubFormulaAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUBFORMULAAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
+ <key>
+ <column name="`SUPERFORMULAAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
</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/IntegerDiscriminatorAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_h_o_hibernate.hbm.xml
index cb3fc1deb..03b2f1ade 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/IntegerDiscriminatorAction_hsqldb_h_o_hibernate.hbm.xml
@@ -119,153 +119,18 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubAuditing" abstract="false" lazy="false" discriminator-value="SubAuditing" table="`SUBAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubAuditing" abstract="false" lazy="false" extends="SuperAuditing" discriminator-value="SubAuditing">
<meta attribute="eclassName" inherit="false">SubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SUBAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="OtherSubAuditing" abstract="false" lazy="false" discriminator-value="OtherSubAuditing" table="`OTHERSUBAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="OtherSubAuditing" abstract="false" lazy="false" extends="SuperAuditing" discriminator-value="OtherSubAuditing">
<meta attribute="eclassName" inherit="false">OtherSubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="OTHERSUBAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="OTHERSUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AbstractSubAuditing" abstract="false" lazy="false" discriminator-value="AbstractSubAuditing" table="`ABSTRACTSUBAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AbstractSubAuditing" abstract="false" lazy="false" extends="SuperAuditing" discriminator-value="AbstractSubAuditing">
<meta attribute="eclassName" inherit="false">AbstractSubAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="ABSTRACTSUBAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ABSTRACTSUBAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SuperFormulaAuditing" abstract="false" lazy="false" discriminator-value="SuperFormulaAuditing" table="`SUPERFORMULAAUDITING`">
<meta attribute="eclassName" inherit="false">SuperFormulaAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
@@ -315,53 +180,8 @@
<column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubFormulaAuditing" abstract="false" lazy="false" discriminator-value="SubFormulaAuditing" table="`SUBFORMULAAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SubFormulaAuditing" abstract="false" lazy="false" extends="SuperFormulaAuditing" discriminator-value="SubFormulaAuditing">
<meta attribute="eclassName" inherit="false">SubFormulaAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/integerdiscriminatorAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SUBFORMULAAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SUBFORMULAAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
+ </subclass>
</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_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 0decf66b6..c1a9d0c3f 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
@@ -80,59 +80,6 @@
<column not-null="false" unique="false" name="`COMMENT`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AddIDDocumentAuditing" abstract="false" lazy="false" table="`ADDIDDOCUMENTAUDITING`">
- <meta attribute="eclassName" inherit="false">AddIDDocumentAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDIDDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentAuditing" abstract="false" lazy="false" table="`DOCUMENTAUDITING`">
<meta attribute="eclassName" inherit="false">DocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
@@ -183,115 +130,27 @@
<column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" table="`PARENTDOCUMENTAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AddIDDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" table="`ADDIDDOCUMENTAUDITING`">
+ <meta attribute="eclassName" inherit="false">AddIDDocumentAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
+ <key>
+ <column name="`DOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" table="`PARENTDOCUMENTAUDITING`">
<meta attribute="eclassName" inherit="false">ParentDocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PARENTDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYNAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" table="`SPECIFICDOCUMENTAUDITING`">
+ <key>
+ <column name="`DOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" extends="ParentDocumentAuditing" table="`SPECIFICDOCUMENTAUDITING`">
<meta attribute="eclassName" inherit="false">SpecificDocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`PARENTDOCUMENT_NAME`" length="50"/>
- </property>
- <property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYSPECIFICINFO`"/>
- </property>
- </class>
+ <key>
+ <column name="`PARENTDOCUMENTAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestReferenceAuditing" abstract="false" lazy="false" table="`TESTREFERENCEAUDITING`">
<meta attribute="eclassName" inherit="false">TestReferenceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
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 66d0ccd7f..7025a41f3 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
@@ -92,62 +92,6 @@
<column not-null="false" unique="false" name="`COMMENT`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AddIDDocumentAuditing" abstract="false" lazy="false" discriminator-value="AddIDDocumentAuditing" table="`ADDIDDOCUMENTAUDITING`">
- <meta attribute="eclassName" inherit="false">AddIDDocumentAuditing</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="ADDIDDOCUMENTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDIDDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DocumentAuditing" abstract="false" lazy="false" discriminator-value="DocumentAuditing" table="`DOCUMENTAUDITING`">
<meta attribute="eclassName" inherit="false">DocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
@@ -201,121 +145,18 @@
<column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" discriminator-value="ParentDocumentAuditing" table="`PARENTDOCUMENTAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="AddIDDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" discriminator-value="AddIDDocumentAuditing">
+ <meta attribute="eclassName" inherit="false">AddIDDocumentAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ParentDocumentAuditing" abstract="false" lazy="false" extends="DocumentAuditing" discriminator-value="ParentDocumentAuditing">
<meta attribute="eclassName" inherit="false">ParentDocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="PARENTDOCUMENTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PARENTDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYNAME`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" discriminator-value="SpecificDocumentAuditing" table="`SPECIFICDOCUMENTAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="SpecificDocumentAuditing" abstract="false" lazy="false" extends="ParentDocumentAuditing" discriminator-value="SpecificDocumentAuditing">
<meta attribute="eclassName" inherit="false">SpecificDocumentAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
- <cache usage="read-write"/>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="SPECIFICDOCUMENTAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="SPECIFICDOCUMENTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="myGenericInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYGENERICINFO`"/>
- </property>
- <property name="myTestReference" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYTESTREFERENCE`"/>
- </property>
- <property name="myName" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`PARENTDOCUMENT_NAME`" length="50"/>
- </property>
- <property name="mySpecificInfo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`MYSPECIFICINFO`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestReferenceAuditing" abstract="false" lazy="false" discriminator-value="TestReferenceAuditing" table="`TESTREFERENCEAUDITING`">
<meta attribute="eclassName" inherit="false">TestReferenceAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/mappedsuperclassAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
index 8173139a3..be2b486a8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_e_o_hibernate.hbm.xml
@@ -148,139 +148,20 @@
<column not-null="false" unique="false" name="`AGE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" table="`EMPLOYEEAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`EMPLOYEEAUDITING`">
<meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="EMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`AGE`"/>
- </property>
- <component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
- <meta attribute="eclassName" inherit="false">Address</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_CITY`"/>
- </property>
- <many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
- <column not-null="false" unique="false" name="`ADDR_COUNTRY`"/>
- </many-to-one>
- </component>
- <property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`EMPLOYEENUMBER`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" table="`NONEMPLOYEEAUDITING`">
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" table="`NONEMPLOYEEAUDITING`">
<meta attribute="eclassName" inherit="false">NonEmployeeAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="NONEMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`AGE`"/>
- </property>
- <component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
- <meta attribute="eclassName" inherit="false">Address</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_CITY`"/>
- </property>
- <many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
- <column not-null="false" unique="false" name="`COUNTRY_COUNTRY_E_ID`"/>
- </many-to-one>
- </component>
- </class>
+ <key>
+ <column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CountryAuditing" abstract="false" lazy="false" table="`COUNTRYAUDITING`">
<meta attribute="eclassName" inherit="false">CountryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
index 15e5a4b68..3b6d41ec0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_hsqldb_h_o_hibernate.hbm.xml
@@ -157,145 +157,14 @@
<column not-null="false" unique="false" name="`AGE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" discriminator-value="EmployeeAuditing" table="`EMPLOYEEAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="EmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="EmployeeAuditing">
<meta attribute="eclassName" inherit="false">EmployeeAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="EMPLOYEEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="EMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`AGE`"/>
- </property>
- <component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
- <meta attribute="eclassName" inherit="false">Address</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`OTHER_CITY`"/>
- </property>
- <many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
- <column not-null="false" unique="false" name="`ADDR_COUNTRY`"/>
- </many-to-one>
- </component>
- <property name="employeeNumber" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`EMPLOYEENUMBER`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" discriminator-value="NonEmployeeAuditing" table="`NONEMPLOYEEAUDITING`">
+ </subclass>
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="NonEmployeeAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="NonEmployeeAuditing">
<meta attribute="eclassName" inherit="false">NonEmployeeAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="NONEMPLOYEEAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="NONEMPLOYEEAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
- </property>
- <property name="age" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`AGE`"/>
- </property>
- <component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
- <meta attribute="eclassName" inherit="false">Address</meta>
- <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_NAME`"/>
- </property>
- <property name="street" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_STREET`"/>
- </property>
- <property name="city" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`ADDRESS_CITY`"/>
- </property>
- <many-to-one name="country" entity-name="Country" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="ADDRESS_COUNTRY" insert="true" update="true" not-null="false">
- <column not-null="false" unique="false" name="`COUNTRY_COUNTRY_E_ID`"/>
- </many-to-one>
- </component>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CountryAuditing" abstract="false" lazy="false" discriminator-value="CountryAuditing" table="`COUNTRYAUDITING`">
<meta attribute="eclassName" inherit="false">CountryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytableAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_e_o_hibernate.hbm.xml
index 393c95fd7..29f5cf7f8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_e_o_hibernate.hbm.xml
@@ -118,59 +118,13 @@
<column not-null="false" unique="false" name="`TOTALPEOPLE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" table="`CHILDAUDITING`">
+ <joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="ParentAuditing" table="`CHILDAUDITING`">
<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/variousAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <list name="children" table="`CHILDAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
- <key update="true">
- <column name="`CHILDAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`CHILDAUDITING_CHILDREN_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <property name="totalPeople" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TOTALPEOPLE`"/>
- </property>
- </class>
+ <key>
+ <column name="`PARENTAUDITING_TENEO_AUDIT_ID`"/>
+ </key>
+ </joined-subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ImmutableCityAuditing" abstract="false" lazy="false" table="`IMMUTABLECITYAUDITING`">
<meta attribute="eclassName" inherit="false">ImmutableCityAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/variousAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_h_o_hibernate.hbm.xml
index 433f32352..e094fc687 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/VariousAction_hsqldb_h_o_hibernate.hbm.xml
@@ -124,62 +124,10 @@
<column not-null="false" unique="false" name="`TOTALPEOPLE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" discriminator-value="ChildAuditing" table="`CHILDAUDITING`">
+ <subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ChildAuditing" abstract="false" lazy="false" extends="ParentAuditing" discriminator-value="ChildAuditing">
<meta attribute="eclassName" inherit="false">ChildAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/variousAuditing</meta>
- <id name="teneo_audit_id" type="long" unsaved-value="0">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
- <generator class="native"/>
- </id>
- <discriminator type="string">
- <column name="`DTYPE`" index="CHILDAUDITINGDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`" index="teneo_derived_object"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_END`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="CHILDAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`" unique-key="c2"/>
- </property>
- <list name="children" table="`CHILDAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
- <key update="true">
- <column name="`CHILDAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`CHILDAUDITING_CHILDREN_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <property name="totalPeople" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TOTALPEOPLE`"/>
- </property>
- </class>
+ </subclass>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ImmutableCityAuditing" abstract="false" lazy="false" discriminator-value="ImmutableCityAuditing" table="`IMMUTABLECITYAUDITING`">
<meta attribute="eclassName" inherit="false">ImmutableCityAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/variousAuditing</meta>

Back to the top