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

23 files changed, 71 insertions, 71 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_e_o_hibernate.hbm.xml
index 6faacbe4e..b3e594ce7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_e_o_hibernate.hbm.xml
@@ -22,14 +22,14 @@
 			<column not-null="false" unique="false" name="`ANYONE_ID`"/>
 		</any>
 		<list name="any" table="`ANYOBJECT_ANY`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="ANYOBJECT_ANY_KEY" update="true">
 				<column name="`ANYOBJECT_ANY_ID`" unique="false"/>
 			</key>
 			<list-index column="`ANYOBJECT_ANY_IDX`"/>
 			<one-to-many entity-name="AnyObject_any"/>
 		</list>
 		<list name="group" table="`ANYOBJECT_GROUP`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="ANYOBJECT_GROUP_KEY" update="true">
 				<column name="`ANYOBJECT_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`ANYOBJECT_GROUP_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_h_o_hibernate.hbm.xml
index cca38cc37..a0386e16a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/AnyAction_hsqldb_h_o_hibernate.hbm.xml
@@ -25,14 +25,14 @@
 			<column not-null="false" unique="false" name="`ANYONE_ID`"/>
 		</any>
 		<list name="any" table="`ANYOBJECT_ANY`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="ANYOBJECT_ANY_KEY" update="true">
 				<column name="`ANYOBJECT_ANY_ID`" unique="false"/>
 			</key>
 			<list-index column="`ANYOBJECT_ANY_IDX`"/>
 			<one-to-many entity-name="AnyObject_any"/>
 		</list>
 		<list name="group" table="`ANYOBJECT_GROUP`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="ANYOBJECT_GROUP_KEY" update="true">
 				<column name="`ANYOBJECT_GROUP_ID`" unique="false"/>
 			</key>
 			<list-index column="`ANYOBJECT_GROUP_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_e_o_hibernate.hbm.xml
index a5b0122a1..247c8cd0f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_e_o_hibernate.hbm.xml
@@ -13,7 +13,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="barKeys" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BARENTITY_BARKEYS">
+			<key foreign-key="BARENTITY_BARKEYS_KEY" update="true">
 				<column name="`BARENTITY_BARKEYS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BARENTITY_BARKEYS_IDX`"/>
@@ -114,7 +114,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="barKeys" table="`BARAUDITING_BARKEYSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="BARAUDITING_BARKEYS_KEY" update="true">
 				<column name="`BARAUDITING_BARKEYS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`BARAUDITING_BARKEYS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_h_o_hibernate.hbm.xml
index 685a66f1e..2c34c7011 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/BZ290969Action_hsqldb_h_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<meta attribute="syntheticVersion" inherit="false">true</meta>
 		</version>
 		<list name="barKeys" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BARENTITY_BARKEYS">
+			<key foreign-key="BARENTITY_BARKEYS_KEY" update="true">
 				<column name="`BARENTITY_BARKEYS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BARENTITY_BARKEYS_IDX`"/>
@@ -129,7 +129,7 @@
 			<column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
 		</property>
 		<list name="barKeys" table="`BARAUDITING_BARKEYSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="BARAUDITING_BARKEYS_KEY" update="true">
 				<column name="`BARAUDITING_BARKEYS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`BARAUDITING_BARKEYS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
index 35db7b2cd..c32a7ace9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
@@ -61,7 +61,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" fetch="subselect" table="`LIBRARY_WRITER`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="SCHRIJVERS_KEY" update="true">
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
@@ -70,7 +70,7 @@
 			</many-to-many>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="LIBRARY_BOOKS">
+			<key foreign-key="LIBRARY_BOOKS_KEY" update="true">
 				<column name="`LIBRARY_BOOKS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_BOOKS_IDX`"/>
@@ -282,7 +282,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="LIBRARYAUDITING_BOOKS_KEY" update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_BOOKS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
index 56f107e4c..2bb878050 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
@@ -70,7 +70,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" fetch="subselect" table="`LIBRARY_WRITER`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="SCHRIJVERS_KEY" update="true">
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
@@ -79,7 +79,7 @@
 			</many-to-many>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="LIBRARY_BOOKS">
+			<key foreign-key="LIBRARY_BOOKS_KEY" update="true">
 				<column name="`LIBRARY_BOOKS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_BOOKS_IDX`"/>
@@ -306,7 +306,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="LIBRARYAUDITING_BOOKS_KEY" update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_BOOKS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
index 35db7b2cd..c32a7ace9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -61,7 +61,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" fetch="subselect" table="`LIBRARY_WRITER`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="SCHRIJVERS_KEY" update="true">
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
@@ -70,7 +70,7 @@
 			</many-to-many>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="LIBRARY_BOOKS">
+			<key foreign-key="LIBRARY_BOOKS_KEY" update="true">
 				<column name="`LIBRARY_BOOKS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_BOOKS_IDX`"/>
@@ -282,7 +282,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="LIBRARYAUDITING_BOOKS_KEY" update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_BOOKS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
index 56f107e4c..2bb878050 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -70,7 +70,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<list name="writers" fetch="subselect" table="`LIBRARY_WRITER`" lazy="true" cascade="all,delete-orphan">
-			<key update="true">
+			<key foreign-key="SCHRIJVERS_KEY" update="true">
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
@@ -79,7 +79,7 @@
 			</many-to-many>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="LIBRARY_BOOKS">
+			<key foreign-key="LIBRARY_BOOKS_KEY" update="true">
 				<column name="`LIBRARY_BOOKS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_BOOKS_IDX`"/>
@@ -306,7 +306,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="books" table="`LIBRARYAUDITING_BOOKSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="LIBRARYAUDITING_BOOKS_KEY" update="true">
 				<column name="`LIBRARYAUDITING_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARYAUDITING_BOOKS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_hsqldb_e_o_hibernate.hbm.xml
index 363e84d3a..5663facaa 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EMapEAVAction_hsqldb_e_o_hibernate.hbm.xml
@@ -58,7 +58,7 @@
 			<column not-null="false" unique="false" name="`TITLE`"/>
 		</property>
 		<list name="writers" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="BOOKAUDITING_WRITERS">
+			<key foreign-key="BOOKAUDITING_WRITERS_KEY" update="true">
 				<column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
index fb8f987cd..c93112d56 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
@@ -16,14 +16,14 @@
 			<column not-null="true" unique="false" name="`TITLE`"/>
 		</property>
 		<list name="authors" inverse="true" lazy="extra" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="BOOK_AUTHORS">
+			<key foreign-key="BOOK_AUTHORS_KEY" update="true">
 				<column name="`BOOK_AUTHORS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BOOK_AUTHORS_IDX`"/>
 			<one-to-many entity-name="Writer"/>
 		</list>
 		<list name="subTitles" table="`BOOK_SUBTITLES`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="BOOK_SUBTITLES_KEY" update="true">
 				<column name="`BOOK_SUBTITLES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BOOK_SUBTITLES_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
index f3dcd6150..deac02964 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
@@ -19,14 +19,14 @@
 			<column not-null="true" unique="false" name="`TITLE`"/>
 		</property>
 		<list name="authors" inverse="true" lazy="extra" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="BOOK_AUTHORS">
+			<key foreign-key="BOOK_AUTHORS_KEY" update="true">
 				<column name="`BOOK_AUTHORS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BOOK_AUTHORS_IDX`"/>
 			<one-to-many entity-name="Writer"/>
 		</list>
 		<list name="subTitles" table="`BOOK_SUBTITLES`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="BOOK_SUBTITLES_KEY" update="true">
 				<column name="`BOOK_SUBTITLES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BOOK_SUBTITLES_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml
index de8236228..d8b6ca90e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_e_o_hibernate.hbm.xml
@@ -50,7 +50,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.ContainedItem"/>
@@ -62,7 +62,7 @@
 			<one-to-many entity-name="testSet.Item"/>
 		</bag>
 		<bag name="joinedItem" order-by="ABS(number)" inverse="true" lazy="extra" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_JOINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.Item"/>
@@ -250,21 +250,21 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="containedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_CONTAINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_CONTAINEDITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="item" table="`TESTSETAUDITING_ITEMLISTAUDITING_ITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<bag name="joinedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_JOINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml
index eea0184f3..1f0c18dc4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/ExtraLazySetAction_hsqldb_h_o_hibernate.hbm.xml
@@ -59,7 +59,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.ContainedItem"/>
@@ -71,7 +71,7 @@
 			<one-to-many entity-name="testSet.Item"/>
 		</bag>
 		<bag name="joinedItem" order-by="ABS(number)" inverse="true" lazy="extra" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_JOINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.Item"/>
@@ -271,21 +271,21 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="containedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_CONTAINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_CONTAINEDITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="item" table="`TESTSETAUDITING_ITEMLISTAUDITING_ITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<bag name="joinedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEMAUDITING`" lazy="extra" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_JOINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml
index 6464cf255..be5e8f5a4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_e_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="children" lazy="true" cascade="persist,merge,refresh,delete,save-update,delete-orphan,lock">
-			<key update="true" foreign-key="PARENT_CHILDREN">
+			<key foreign-key="PARENT_CHILDREN_KEY" update="true">
 				<column name="`PARENT_CHILDREN_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="Child"/>
@@ -108,7 +108,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PARENTAUDITING_CHILDREN_KEY" update="true">
 				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml
index 795a315d0..cc83434ea 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbCascadeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -19,7 +19,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="children" lazy="true" cascade="persist,merge,refresh,delete,save-update,delete-orphan,lock">
-			<key update="true" foreign-key="PARENT_CHILDREN">
+			<key foreign-key="PARENT_CHILDREN_KEY" update="true">
 				<column name="`PARENT_CHILDREN_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="Child"/>
@@ -120,7 +120,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PARENTAUDITING_CHILDREN_KEY" update="true">
 				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_e_o_hibernate.hbm.xml
index 0a4d12960..3551bc4cb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_e_o_hibernate.hbm.xml
@@ -133,7 +133,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="streets" table="`CITYAUDITING_STREETSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="CITYAUDITING_STREETS_KEY" update="true">
 				<column name="`CITYAUDITING_STREETS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`CITYAUDITING_STREETS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_h_o_hibernate.hbm.xml
index 51cce083c..422edaec6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HibernateAction_hsqldb_h_o_hibernate.hbm.xml
@@ -151,7 +151,7 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="streets" table="`CITYAUDITING_STREETSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="CITYAUDITING_STREETS_KEY" update="true">
 				<column name="`CITYAUDITING_STREETS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`CITYAUDITING_STREETS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
index df5e7974d..cb5b0cb2b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
@@ -45,7 +45,7 @@
 			<column name="`PERSON_LASTNAME`"/>
 		</key>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="PARENT_CHILDREN">
+			<key foreign-key="PARENT_CHILDREN_KEY" update="true">
 				<column name="`MYPARENTFIRSTNAME`" unique="false"/>
 				<column name="`MYPARENTLASTNAME`" unique="false"/>
 			</key>
@@ -76,7 +76,7 @@
 			<column not-null="false" unique="false" name="`PARENT_OWNER_LASTNAME`"/>
 		</many-to-one>
 		<list name="visitors" table="`HOUSE_PERSON`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="HOUSE_VISITORS_KEY" update="true">
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
@@ -161,14 +161,14 @@
 			<column not-null="false" unique="false" name="`LASTNAME`"/>
 		</property>
 		<list name="friends" table="`PERSONAUDITING_FRIENDSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_FRIENDS_KEY" update="true">
 				<column name="`PERSONAUDITING_FRIENDS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_FRIENDS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="oppositeFriends" table="`PERSONAUDITING_OPPOSITEFRIENDSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_OPPOSITEFRIENDS_KEY" update="true">
 				<column name="`PERSONAUDITING_OPPOSITEFRIENDS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_OPPOSITEFRIENDS_IDX`"/>
@@ -182,7 +182,7 @@
 			<column name="`PERSONAUDITING_TENEO_AUDIT_ID`"/>
 		</key>
 		<list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PARENTAUDITING_CHILDREN_KEY" update="true">
 				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
@@ -248,7 +248,7 @@
 			<column not-null="false" unique="false" name="`OWNER`"/>
 		</property>
 		<list name="visitors" table="`HOUSEAUDITING_VISITORSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="HOUSEAUDITING_VISITORS_KEY" update="true">
 				<column name="`HOUSEAUDITING_VISITORS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`HOUSEAUDITING_VISITORS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
index 5e065b4d6..326245f76 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -44,7 +44,7 @@
 		<meta attribute="eclassName" inherit="false">Parent</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta>
 		<list name="children" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="PARENT_CHILDREN">
+			<key foreign-key="PARENT_CHILDREN_KEY" update="true">
 				<column name="`MYPARENTFIRSTNAME`" unique="false"/>
 				<column name="`MYPARENTLASTNAME`" unique="false"/>
 			</key>
@@ -74,7 +74,7 @@
 			<column not-null="false" unique="false" name="`PARENT_OWNER_LASTNAME`"/>
 		</many-to-one>
 		<list name="visitors" table="`HOUSE_PERSON`" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="HOUSE_VISITORS_KEY" update="true">
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
@@ -165,14 +165,14 @@
 			<column not-null="false" unique="false" name="`LASTNAME`"/>
 		</property>
 		<list name="friends" table="`PERSONAUDITING_FRIENDSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_FRIENDS_KEY" update="true">
 				<column name="`PERSONAUDITING_FRIENDS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_FRIENDS_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="oppositeFriends" table="`PERSONAUDITING_OPPOSITEFRIENDSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_OPPOSITEFRIENDS_KEY" update="true">
 				<column name="`PERSONAUDITING_OPPOSITEFRIENDS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_OPPOSITEFRIENDS_IDX`"/>
@@ -183,7 +183,7 @@
 		<meta attribute="eclassName" inherit="false">ParentAuditing</meta>
 		<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumnsAuditing</meta>
 		<list name="children" table="`PARENTAUDITING_CHILDRENAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PARENTAUDITING_CHILDREN_KEY" update="true">
 				<column name="`PARENTAUDITING_CHILDREN_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PARENTAUDITING_CHILDREN_IDX`"/>
@@ -249,7 +249,7 @@
 			<column not-null="false" unique="false" name="`OWNER`"/>
 		</property>
 		<list name="visitors" table="`HOUSEAUDITING_VISITORSAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="HOUSEAUDITING_VISITORS_KEY" update="true">
 				<column name="`HOUSEAUDITING_VISITORS_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`HOUSEAUDITING_VISITORS_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_e_o_hibernate.hbm.xml
index 8bc9c73b9..c962799bb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_e_o_hibernate.hbm.xml
@@ -50,7 +50,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.ContainedItem"/>
@@ -62,7 +62,7 @@
 			<one-to-many entity-name="testSet.Item"/>
 		</bag>
 		<bag name="joinedItem" order-by="ABS(number)" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_JOINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.Item"/>
@@ -250,21 +250,21 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="containedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_CONTAINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_CONTAINEDITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="item" table="`TESTSETAUDITING_ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<bag name="joinedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_JOINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_h_o_hibernate.hbm.xml
index 198d960dc..96f4598e3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/SetAction_hsqldb_h_o_hibernate.hbm.xml
@@ -59,7 +59,7 @@
 			<column not-null="true" unique="false" name="`NAME`"/>
 		</property>
 		<bag name="containedItem" lazy="true" cascade="all,delete-orphan">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_CONTAINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.ContainedItem"/>
@@ -71,7 +71,7 @@
 			<one-to-many entity-name="testSet.Item"/>
 		</bag>
 		<bag name="joinedItem" order-by="ABS(number)" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true" foreign-key="TESTSET_ITEMLIST_JOINEDITEM">
+			<key foreign-key="TESTSET_ITEMLIST_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLIST_JOINEDITEM_E_ID`" unique="false"/>
 			</key>
 			<one-to-many entity-name="testSet.Item"/>
@@ -271,21 +271,21 @@
 			<column not-null="false" unique="false" name="`NAME`"/>
 		</property>
 		<list name="containedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_CONTAINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_CONTAINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_CONTAINEDITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<list name="item" table="`TESTSETAUDITING_ITEMLISTAUDITING_ITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_ITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_ITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`ITEMLISTAUDITING_ITEM_IDX`"/>
 			<element type="java.lang.String"/>
 		</list>
 		<bag name="joinedItem" table="`TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEMAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="TESTSETAUDITING_ITEMLISTAUDITING_JOINEDITEM_KEY" update="true">
 				<column name="`ITEMLISTAUDITING_JOINEDITEM_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<element type="java.lang.String"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_e_o_hibernate.hbm.xml
index 95069f329..99920b17e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_e_o_hibernate.hbm.xml
@@ -26,7 +26,7 @@
 			<column not-null="true" unique="false" name="`NUMBERS`"/>
 		</property>
 		<list name="phoneNumbers" table="`PERSON_PHONENUMBERS`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSON_PHONENUMBERS_KEY" update="true">
 				<column name="`PERSON_PHONENUMBERS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_PHONENUMBERS_IDX`"/>
@@ -57,7 +57,7 @@
 			<type name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CertificateType"/>
 		</property>
 		<list name="certificates" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="PERSON_CERTIFICATES_KEY" update="true">
 				<column name="`PERSON_CERTIFICATES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_CERTIFICATES_IDX`"/>
@@ -176,7 +176,7 @@
 			<column not-null="false" unique="false" name="`NUMBERS`"/>
 		</property>
 		<list name="addresses" table="`PERSONAUDITING_ADDRESSESAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_ADDRESSES_KEY" update="true">
 				<column name="`PERSONAUDITING_ADDRESSES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_ADDRESSES_IDX`"/>
@@ -198,7 +198,7 @@
 			<type name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CertificateType"/>
 		</property>
 		<list name="certificates" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_CERTIFICATES_KEY" update="true">
 				<column name="`PERSONAUDITING_CERTIFICATES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_CERTIFICATES_IDX`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_h_o_hibernate.hbm.xml
index 25dda944b..7ef2069f2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/UserTypeAction_hsqldb_h_o_hibernate.hbm.xml
@@ -29,7 +29,7 @@
 			<column not-null="true" unique="false" name="`NUMBERS`"/>
 		</property>
 		<list name="phoneNumbers" table="`PERSON_PHONENUMBERS`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSON_PHONENUMBERS_KEY" update="true">
 				<column name="`PERSON_PHONENUMBERS_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_PHONENUMBERS_IDX`"/>
@@ -60,7 +60,7 @@
 			<type name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CertificateType"/>
 		</property>
 		<list name="certificates" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="PERSON_CERTIFICATES_KEY" update="true">
 				<column name="`PERSON_CERTIFICATES_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_CERTIFICATES_IDX`"/>
@@ -191,7 +191,7 @@
 			<column not-null="false" unique="false" name="`NUMBERS`"/>
 		</property>
 		<list name="addresses" table="`PERSONAUDITING_ADDRESSESAUDITING`" lazy="true" cascade="all">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_ADDRESSES_KEY" update="true">
 				<column name="`PERSONAUDITING_ADDRESSES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_ADDRESSES_IDX`"/>
@@ -213,7 +213,7 @@
 			<type name="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.CertificateType"/>
 		</property>
 		<list name="certificates" lazy="true" cascade="persist,merge,refresh,save-update,lock">
-			<key update="true">
+			<key foreign-key="PERSONAUDITING_CERTIFICATES_KEY" update="true">
 				<column name="`PERSONAUDITING_CERTIFICATES_TENEO_AUDIT_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSONAUDITING_CERTIFICATES_IDX`"/>