[237361]

7 files changed, 52 insertions, 26 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml
index d19f13028..ae4cef9bc 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_a_o_hibernate.hbm.xml
@@ -13,9 +13,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<bag name="manies" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key/>
-			<many-to-many entity-name="Many" unique="true"/>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
 		</bag>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
@@ -32,9 +36,13 @@
 		<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="`myname`"/>
 		</property>
-		<join table="maniesofone" inverse="true" optional="true">
-			<key/>
-			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one"/>
+		<join table="maniesofone" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="true" unique="false" name="`one_e_id`"/>
+			</many-to-one>
 		</join>
 	</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.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml
index 2ec3ce235..73b31df31 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_e_o_hibernate.hbm.xml
@@ -12,9 +12,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<bag name="manies" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key/>
-			<many-to-many entity-name="Many" unique="true"/>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
 		</bag>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
@@ -30,9 +34,13 @@
 		<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="`myname`"/>
 		</property>
-		<join table="maniesofone" inverse="true" optional="true">
-			<key/>
-			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one"/>
+		<join table="maniesofone" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="true" unique="false" name="`one_e_id`"/>
+			</many-to-one>
 		</join>
 	</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.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml
index 2ec3ce235..73b31df31 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_mysql_s_o_hibernate.hbm.xml
@@ -12,9 +12,13 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<bag name="manies" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
-			<key/>
-			<many-to-many entity-name="Many" unique="true"/>
+		<bag name="manies" inverse="true" table="`maniesofone`" lazy="true" cascade="merge,persist,save-update,lock,refresh">
+			<key update="true">
+				<column name="`one_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-many entity-name="Many" unique="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</many-to-many>
 		</bag>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237361.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
@@ -30,9 +34,13 @@
 		<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="`myname`"/>
 		</property>
-		<join table="maniesofone" inverse="true" optional="true">
-			<key/>
-			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one"/>
+		<join table="maniesofone" inverse="false" optional="true">
+			<key update="true">
+				<column name="`many_e_id`" not-null="true" unique="false"/>
+			</key>
+			<many-to-one name="one" entity-name="One" lazy="false" insert="true" update="true" cascade="merge,persist,save-update,lock,refresh" foreign-key="many_one">
+				<column not-null="true" unique="false" name="`one_e_id`"/>
+			</many-to-one>
 		</join>
 	</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.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml
index 40693eda5..35137a051 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml
@@ -4,7 +4,7 @@
 <hibernate-mapping auto-import="false">
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" discriminator-value="One" table="`one`">
 		<meta attribute="eclassName">One</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
@@ -22,7 +22,7 @@
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" discriminator-value="Many" table="`many`">
 		<meta attribute="eclassName">Many</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml
index 8e31da041..523aff914 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml
@@ -4,7 +4,7 @@
 <hibernate-mapping auto-import="false">
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
 		<meta attribute="eclassName">One</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
@@ -21,7 +21,7 @@
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
 		<meta attribute="eclassName">Many</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml
index 8e31da041..523aff914 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml
@@ -4,7 +4,7 @@
 <hibernate-mapping auto-import="false">
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.OneImpl" entity-name="One" abstract="false" lazy="false" table="`one`">
 		<meta attribute="eclassName">One</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
@@ -21,7 +21,7 @@
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.issues.bz237498.impl.ManyImpl" entity-name="Many" abstract="false" lazy="false" table="`many`">
 		<meta attribute="eclassName">Many</meta>
-		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz225296</meta>
+		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bz237498</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"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
index ec93f1155..37d147b94 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.teneo.test.issues.AbstractReferenceAction;
 import org.eclipse.emf.teneo.test.issues.AbstractTopClassAction;
 import org.eclipse.emf.teneo.test.issues.BZ224991Action;
 import org.eclipse.emf.teneo.test.issues.BZ225296_2Action;
+import org.eclipse.emf.teneo.test.issues.BZ237361Action;
 import org.eclipse.emf.teneo.test.issues.BZ237498Action;
 import org.eclipse.emf.teneo.test.issues.BZ237790Action;
 import org.eclipse.emf.teneo.test.issues.BZ237994Action;
@@ -37,7 +38,7 @@ import org.eclipse.emf.teneo.test.issues.TopClassesAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
  */
 public class AllTests {
 
@@ -45,8 +46,9 @@ public class AllTests {
 		TestSuite suite =
 				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.issues", HibernateTestbed
 					.instance().getConfigurations());
+		suite.addTestSuite(BZ237361Action.class);
+
 		suite.addTestSuite(Bz243024Action.class);
-// suite.addTestSuite(BZ237361Action.class);
 		suite.addTestSuite(Bz245167Action.class);
 		suite.addTestSuite(Bz242995Action.class);
 		suite.addTestSuite(BZ237994Action.class);