Fixes issue 396988 - Also support foreign key attribute on key element in mapping

16 files changed, 74 insertions, 74 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_e_o_hibernate.hbm.xml
index 3269d735d..8cec92561 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_e_o_hibernate.hbm.xml
@@ -13,7 +13,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="names" table="`NAMESTABLE`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEM_NAMES_KEY" update="true">
 				<column name="`JOINCOLUMN1`" unique="false"/>
 				<column name="`JOINCOLUMN1`" unique="false"/>
 			</key>
@@ -21,7 +21,7 @@
 			<element type="java.lang.String"/>
 		</list>
 		<list name="items" table="`EMBEDDEDITEMSTABLE`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="ITEM_ITEMS_KEY" update="true">
 				<column name="`MYJC`" unique="false"/>
 			</key>
 			<list-index column="`ITEM_ITEMS_IDX`"/>
@@ -115,7 +115,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="names" table="`AUDITNAMESTABLE`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_NAMES_KEY" update="true">
 				<column name="`JOINCOLUMN1`" unique="false"/>
 				<column name="`JOINCOLUMN1`" unique="false"/>
 			</key>
@@ -123,7 +123,7 @@
 			<element type="java.lang.String"/>
 		</list>
 		<list name="items" table="`EMBITEMSAUDITTABLE`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_ITEMS_KEY" update="true">
 				<column name="`MYJC`" unique="false"/>
 			</key>
 			<list-index column="`ITEMAUDITING_ITEMS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_h_o_hibernate.hbm.xml
index 521bbf28e..9a6408277 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/CollectionTableAction_hsqldb_h_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="names" table="`NAMESTABLE`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEM_NAMES_KEY" update="true">
 				<column name="`JOINCOLUMN1`" unique="false"/>
 				<column name="`JOINCOLUMN1`" unique="false"/>
 			</key>
@@ -24,7 +24,7 @@
 			<element type="java.lang.String"/>
 		</list>
 		<list name="items" table="`EMBEDDEDITEMSTABLE`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="ITEM_ITEMS_KEY" update="true">
 				<column name="`MYJC`" unique="false"/>
 			</key>
 			<list-index column="`ITEM_ITEMS_IDX`"/>
@@ -127,7 +127,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="names" table="`AUDITNAMESTABLE`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_NAMES_KEY" update="true">
 				<column name="`JOINCOLUMN1`" unique="false"/>
 				<column name="`JOINCOLUMN1`" unique="false"/>
 			</key>
@@ -135,7 +135,7 @@
 			<element type="java.lang.String"/>
 		</list>
 		<list name="items" table="`EMBITEMSAUDITTABLE`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_ITEMS_KEY" update="true">
 				<column name="`MYJC`" unique="false"/>
 			</key>
 			<list-index column="`ITEMAUDITING_ITEMS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
index 9f1e618fa..fe8e744a2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_e_o_hibernate.hbm.xml
@@ -13,7 +13,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="names" table="`ITEM_NAMES`" lazy="false" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEM_NAMES_KEY" update="true">
 				<column name="`ITEM_NAMES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEM_NAMES_IDX`"/>
@@ -89,7 +89,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="names" table="`ITEMAUDITING_NAMESAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_NAMES_KEY" update="true">
 				<column name="`ITEMAUDITING_NAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMAUDITING_NAMES_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
index ba248883b..3e85aa7bf 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/ElementCollectionAction_hsqldb_h_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="names" table="`ITEM_NAMES`" lazy="false" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEM_NAMES_KEY" update="true">
 				<column name="`ITEM_NAMES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEM_NAMES_IDX`"/>
@@ -98,7 +98,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="names" table="`ITEMAUDITING_NAMESAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMAUDITING_NAMES_KEY" update="true">
 				<column name="`ITEMAUDITING_NAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMAUDITING_NAMES_IDX`"/>
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 c48126b79..2646c49f6 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
@@ -32,7 +32,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`ABC`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="EMPLOYEE_ADDRESS_KEY" update="true">
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
@@ -55,7 +55,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="STUDENT_ADDRESS">
+			<key foreign-key="STUDENT_ADDRESS_KEY" update="true">
 				<column name="`STUDENT_ADDRESS_ID`" unique="false"/>
 			</key>
 			<list-index column="`STUDENT_ADDRESS_IDX`"/>
@@ -195,7 +195,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="EMPLOYEEAUDITING_ADDRESS_KEY" update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`EMPLOYEEAUDITING_ADDRESS_IDX`"/>
@@ -260,7 +260,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="STUDENTAUDITING_ADDRESS_KEY" update="true">
 				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`STUDENTAUDITING_ADDRESS_IDX`"/>
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 3aeef1533..d5879eb44 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
@@ -38,7 +38,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`ABC`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="EMPLOYEE_ADDRESS_KEY" update="true">
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
@@ -64,7 +64,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="STUDENT_ADDRESS">
+			<key foreign-key="STUDENT_ADDRESS_KEY" update="true">
 				<column name="`STUDENT_ADDRESS_ID`" unique="false"/>
 			</key>
 			<list-index column="`STUDENT_ADDRESS_IDX`"/>
@@ -213,7 +213,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`EMPLOYEEAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="EMPLOYEEAUDITING_ADDRESS_KEY" update="true">
 				<column name="`EMPLOYEEAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`EMPLOYEEAUDITING_ADDRESS_IDX`"/>
@@ -281,7 +281,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="address" table="`STUDENTAUDITING_ADDRESSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="STUDENTAUDITING_ADDRESS_KEY" update="true">
 				<column name="`STUDENTAUDITING_ADDRESS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`STUDENTAUDITING_ADDRESS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
index 0ed1de544..4f6fdd08d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -26,7 +26,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -39,14 +39,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -251,28 +251,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 2338fc021..d6c31a2e0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -29,7 +29,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -42,14 +42,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -269,28 +269,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
index 0ed1de544..4f6fdd08d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -26,7 +26,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -39,14 +39,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -251,28 +251,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 2338fc021..d6c31a2e0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -29,7 +29,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -42,14 +42,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -269,28 +269,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
index 0ed1de544..4f6fdd08d 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -26,7 +26,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -39,14 +39,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -251,28 +251,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
index 2338fc021..d6c31a2e0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<map name="imageFiles" table="`IMAGE_MAPPING`" lazy="false" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_IMAGEFILES_KEY"/>
 			<map-key type="java.lang.String">
 				<column not-null="false" unique="false" name="`IMAGE_NAME`"/>
 			</map-key>
@@ -29,7 +29,7 @@
 			</element>
 		</map>
 		<map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGES_IMAGETYPENAMES_E_ID`" unique="false"/>
 			</key>
 			<map-key>
@@ -42,14 +42,14 @@
 			<element type="java.lang.String"/>
 		</map>
 		<map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="IMAGES_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGES_IMAGEDATEDESCRIPTIONS_E_ID`" unique="false"/>
 			</key>
 			<map-key type="timestamp"/>
 			<element type="java.lang.String"/>
 		</map>
 		<map name="photoParts" table="`PHOTOPARTS_MAP`" lazy="true" cascade="all,delete-orphan">
-			<key/>
+			<key foreign-key="IMAGES_PHOTOPARTS_KEY"/>
 			<map-key-many-to-many entity-name="PhotoPart">
 				<column not-null="true" unique="false" name="`PARTS_NAME`"/>
 			</map-key-many-to-many>
@@ -269,28 +269,28 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="imageFiles" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
+			<key foreign-key="IMAGESAUDITING_IMAGEFILES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
 			<one-to-many entity-name="StringToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
+			<key foreign-key="IMAGESAUDITING_IMAGETYPENAMES_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
 			<one-to-many entity-name="EnumToStringMapEntryAuditing"/>
 		</list>
 		<list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
+			<key foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_KEY" update="true">
 				<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
 			<one-to-many entity-name="DateToStringMapEntryAuditing"/>
 		</list>
 		<list name="photoParts" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
+			<key foreign-key="IMAGESAUDITING_PHOTOPARTS_KEY" update="true">
 				<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
index c780a5a02..e9e913a2f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -36,7 +36,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="item" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="ITEMLIST_ITEM">
+			<key foreign-key="ITEMLIST_ITEM_KEY" update="true">
 				<column name="`ITEMLIST_ITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="Item"/>
@@ -172,7 +172,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="item" table="`ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 5ddf154fc..630e027b1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrderColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -42,7 +42,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="item" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="ITEMLIST_ITEM">
+			<key foreign-key="ITEMLIST_ITEM_KEY" update="true">
 				<column name="`ITEMLIST_ITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="Item"/>
@@ -187,7 +187,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="item" table="`ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
index 474835443..87ff26077 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_e_o_hibernate.hbm.xml
@@ -13,7 +13,7 @@
 		</version>
 		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="persist,save-update,lock,delete,delete-orphan" lazy="false" property-ref="employee"/>
 		<list name="addresses" lazy="true" cascade="persist,merge,refresh,save-update,lock,delete-orphan">
-			<key update="true" foreign-key="EMPLOYEE_ADDRESSES">
+			<key foreign-key="EMPLOYEE_ADDRESSES_KEY" update="true">
 				<column name="`EMPLOYEE_ADDRESSES_ID`" unique="false"/>
 			</key>
 			<list-index column="`EMPLOYEE_ADDRESSES_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
index 8238f1d72..165896b7b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/OrphanRemovalAction_hsqldb_h_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 		</version>
 		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="persist,save-update,lock,delete,delete-orphan" lazy="false" property-ref="employee"/>
 		<list name="addresses" lazy="true" cascade="persist,merge,refresh,save-update,lock,delete-orphan">
-			<key update="true" foreign-key="EMPLOYEE_ADDRESSES">
+			<key foreign-key="EMPLOYEE_ADDRESSES_KEY" update="true">
 				<column name="`EMPLOYEE_ADDRESSES_ID`" unique="false"/>
 			</key>
 			<list-index column="`EMPLOYEE_ADDRESSES_IDX`"/>