[239800]

[240587]

8 files changed, 268 insertions, 10 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
new file mode 100644
index 000000000..d81802675
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_a_o_hibernate.hbm.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" 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="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" discriminator-value="Country" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+</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/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
new file mode 100644
index 000000000..aaf231cfd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_e_o_hibernate.hbm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" 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="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+</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/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
new file mode 100644
index 000000000..aaf231cfd
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OverrideSecondaryAction_mysql_s_o_hibernate.hbm.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
+		<meta attribute="eclassName">Person</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<discriminator column="`dtype`" type="string"/>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+	</class>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.EmployeeImpl" entity-name="Employee" abstract="false" lazy="false" extends="Person" discriminator-value="Employee">
+		<meta attribute="eclassName">Employee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<join table="`secondary_table`">
+			<key/>
+			<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+				<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" 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="`emp_num`"/>
+			</property>
+		</join>
+	</subclass>
+	<subclass name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.NonEmployeeImpl" entity-name="NonEmployee" abstract="false" lazy="false" extends="Person" discriminator-value="NonEmployee">
+		<meta attribute="eclassName">NonEmployee</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<component name="address" class="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.AddressImpl">
+			<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" cascade="merge,persist,save-update,lock,refresh" foreign-key="address_country" lazy="false" insert="true" update="true" not-null="false">
+				<column not-null="false" unique="false" name="`country_country_e_id`"/>
+			</many-to-one>
+		</component>
+	</subclass>
+	<class name="org.eclipse.emf.teneo.samples.emf.annotations.attroverridesecondarytable.impl.CountryImpl" entity-name="Country" abstract="false" lazy="false" table="`country`">
+		<meta attribute="eclassName">Country</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/attroverridesecondarytable</meta>
+		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+			<meta attribute="syntheticId">true</meta>
+			<generator class="native"/>
+		</id>
+		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+			<meta attribute="syntheticVersion">true</meta>
+		</version>
+		<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>
+</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/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
index 42e947c5e..7e4781bf9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_a_o_hibernate.hbm.xml
@@ -16,13 +16,17 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
index 5f8b7ecec..7a542ac8e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_e_o_hibernate.hbm.xml
@@ -15,13 +15,17 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
index 5f8b7ecec..7a542ac8e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_s_o_hibernate.hbm.xml
@@ -15,13 +15,17 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
index 5f8b7ecec..7a542ac8e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xjoin_hibernate.hbm.xml
@@ -15,13 +15,17 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
index 42e947c5e..7e4781bf9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SecondarytableHibernateAction_mysql_xsingle_hibernate.hbm.xml
@@ -16,13 +16,17 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<join table="`PERSON_ADDRESS`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="address" lazy="false" insert="true" update="true" not-null="false" unique="false" type="text">
 				<column not-null="false" unique="false" name="`ADDRESS`"/>
 			</property>
 		</join>
 		<join table="`PERSON_PHOTO`">
-			<key column="`ID`"/>
+			<key>
+				<column name="`ID`"/>
+			</key>
 			<property name="photo" lazy="false" insert="true" update="true" not-null="false" unique="false" type="binary">
 				<column not-null="false" unique="false" name="`PHOTO`" length="1000000"/>
 			</property>