Also let auditing use the inheritance structure

1 files changed, 15 insertions, 112 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
index 5521d1f7f..729e195e5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
@@ -390,8 +390,8 @@
 			<element type="java.lang.String"/>
 		</list>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalBicycleAuditing" abstract="false" lazy="false" table="`RENTALBICYCLEAUDITING`">
-		<meta attribute="eclassName" inherit="false">RentalBicycleAuditing</meta>
+	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalUnitAuditing" abstract="false" lazy="false" table="`RENTALUNITAUDITING`">
+		<meta attribute="eclassName" inherit="false">RentalUnitAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</meta>
 		<id name="teneo_audit_id" type="long" unsaved-value="0">
 			<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -412,7 +412,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="RENTALBICYCLEAUDITING_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="RENTALUNITAUDITING_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">
@@ -435,18 +435,14 @@
 		<property name="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
 			<column not-null="false" unique="false" name="`DESCRIPTION`"/>
 		</property>
-		<property name="type" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`TYPE`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalBicycleType</param>
-				<param name="eclassifier">RentalBicycleType</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
-			</type>
-		</property>
-		<property name="manufacturer" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`MANUFACTURER`"/>
-		</property>
 	</class>
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalBicycleAuditing" abstract="false" lazy="false" extends="RentalUnitAuditing" table="`RENTALBICYCLEAUDITING`">
+		<meta attribute="eclassName" inherit="false">RentalBicycleAuditing</meta>
+		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</meta>
+		<key>
+			<column name="`RENTALUNITAUDITING_TENEO_AUDIT_ID`"/>
+		</key>
+	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="CurrencyAuditing" abstract="false" lazy="false" table="`CURRENCYAUDITING`">
 		<meta attribute="eclassName" inherit="false">CurrencyAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</meta>
@@ -493,60 +489,13 @@
 			<column not-null="false" unique="false" name="`CODE`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalCarAuditing" abstract="false" lazy="false" table="`RENTALCARAUDITING`">
+	<joined-subclass name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalCarAuditing" abstract="false" lazy="false" extends="RentalUnitAuditing" table="`RENTALCARAUDITING`">
 		<meta attribute="eclassName" inherit="false">RentalCarAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</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="RENTALCARAUDITING_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="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`DESCRIPTION`"/>
-		</property>
-		<property name="size" lazy="false" not-null="false" insert="true" update="true" unique="false">
-			<column not-null="false" unique="false" name="`SIZE`"/>
-			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
-				<param name="enumClass">org.eclipse.emf.teneo.rental.RentalCarSize</param>
-				<param name="eclassifier">RentalCarSize</param>
-				<param name="epackage">http://www.eclipse.org/emf/teneo/rental</param>
-			</type>
-		</property>
-	</class>
+		<key>
+			<column name="`RENTALUNITAUDITING_TENEO_AUDIT_ID`"/>
+		</key>
+	</joined-subclass>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalContractAuditing" abstract="false" lazy="false" table="`RENTALCONTRACTAUDITING`">
 		<meta attribute="eclassName" inherit="false">RentalContractAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</meta>
@@ -612,52 +561,6 @@
 			<column not-null="false" unique="false" name="`CURRENCY`"/>
 		</property>
 	</class>
-	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="RentalUnitAuditing" abstract="false" lazy="false" table="`RENTALUNITAUDITING`">
-		<meta attribute="eclassName" inherit="false">RentalUnitAuditing</meta>
-		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</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="RENTALUNITAUDITING_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="description" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
-			<column not-null="false" unique="false" name="`DESCRIPTION`"/>
-		</property>
-	</class>
 	<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="ManufacturerAuditing" abstract="false" lazy="false" table="`MANUFACTURERAUDITING`">
 		<meta attribute="eclassName" inherit="false">ManufacturerAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/rentalAuditing</meta>