Support mapped super class for audit model also

2 files changed, 138 insertions, 33 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 3f37a6b71..c48126b79 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -140,8 +140,8 @@
 			<column not-null="false" unique="false" name="`POSTALCODE`"/>
 		</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>
+	<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/jpa2/associationoverrideAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -162,7 +162,7 @@
 		<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="PERSONAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<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">
@@ -194,32 +194,80 @@
 		<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>
-		<list name="address" table="`PERSONAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
+		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
-				<column name="`PERSONAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
+				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
-			<list-index column="`PERSONAUDITING_ADDRESS_IDX`"/>
+			<list-index column="`EMPLOYEEAUDITING_ADDRESS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-	</class>
-	<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/jpa2/associationoverrideAuditing</meta>
-		<key>
-			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
-		</key>
 		<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>
-	</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`">
+	</class>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StudentAuditing" abstract="false" lazy="false" table="`STUDENTAUDITING`">
 		<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/associationoverrideAuditing</meta>
-		<key>
-			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
-		</key>
+		<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="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</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>
+		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
+			<key update="true">
+				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`STUDENTAUDITING_ADDRESS_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
 		<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>
-	</joined-subclass>
+	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index 57c335ad5..3aeef1533 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -155,15 +155,15 @@
 			<column not-null="false" unique="false" name="`POSTALCODE`"/>
 		</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>
+	<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/jpa2/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="PERSONAUDITINGDTYPE" length="255" not-null="true"/>
+			<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`"/>
@@ -180,7 +180,7 @@
 		<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="PERSONAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+		<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">
@@ -212,26 +212,83 @@
 		<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>
-		<list name="address" table="`PERSONAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
+		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
 			<key update="true">
-				<column name="`PERSONAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
+				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
-			<list-index column="`PERSONAUDITING_ADDRESS_IDX`"/>
+			<list-index column="`EMPLOYEEAUDITING_ADDRESS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
-	</class>
-	<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/jpa2/associationoverrideAuditing</meta>
 		<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="StudentAuditing" abstract="false" lazy="false" extends="PersonAuditing" discriminator-value="StudentAuditing">
+	</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`">
 		<meta attribute="eclassName" inherit="false">StudentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/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="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+			<column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+		</property>
+		<property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+		</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>
+		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
+			<key update="true">
+				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
+			</key>
+			<list-index column="`STUDENTAUDITING_ADDRESS_IDX`"/>
+			<element type="java.lang.String"/>
+		</list>
 		<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>
+	</class>
 </hibernate-mapping>
\ No newline at end of file