[243348]

[243616]

11 files changed, 19 insertions, 19 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
index f9377e82c..ad1244c24 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_a_o_hibernate.hbm.xml
@@ -15,7 +15,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="employee_employeeinfo" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" foreign-key="employee_employeeinfo" lazy="false" insert="true" update="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" discriminator-value="EmployeeInfo" table="`employeeinfo`">
 		<meta attribute="eclassName">EmployeeInfo</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
index e8d85b5a3..211f49424 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_e_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="employee_employeeinfo" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" foreign-key="employee_employeeinfo" lazy="false" insert="true" update="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
 		<meta attribute="eclassName">EmployeeInfo</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
index e8d85b5a3..211f49424 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/OnetoonePKAction_mysql_s_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="employeeInfo" entity-name="EmployeeInfo" foreign-key="employee_employeeinfo" cascade="merge,persist,save-update,lock,refresh" lazy="false" constrained="true"/>
+		<many-to-one name="employeeInfo" entity-name="EmployeeInfo" cascade="merge,persist,save-update,lock,refresh" not-null="false" foreign-key="employee_employeeinfo" lazy="false" insert="true" update="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.otopk.impl.EmployeeInfoImpl" entity-name="EmployeeInfo" abstract="false" lazy="false" table="`employeeinfo`">
 		<meta attribute="eclassName">EmployeeInfo</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
index 9f03847ba..b90a24ec5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_a_o_hibernate.hbm.xml
@@ -15,7 +15,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="head" entity-name="Head" foreign-key="body_head" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" foreign-key="body_head" lazy="false" insert="true" update="true" unique="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`">
 		<meta attribute="eclassName">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
index e2e70fe17..18e05bc1e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_e_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="head" entity-name="Head" foreign-key="body_head" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" foreign-key="body_head" lazy="false" insert="true" update="true" unique="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
 		<meta attribute="eclassName">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
index e2e70fe17..18e05bc1e 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/PKeyJoinAction_mysql_s_o_hibernate.hbm.xml
@@ -14,7 +14,7 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<one-to-one name="head" entity-name="Head" foreign-key="body_head" cascade="all" lazy="false" constrained="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="true" foreign-key="body_head" lazy="false" insert="true" update="true" unique="true"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.primarykeyjoin.impl.HeadImpl" entity-name="Head" abstract="false" lazy="false" table="`head`">
 		<meta attribute="eclassName">Head</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
index 3d06126fb..f1bb699d3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_a_o_hibernate.hbm.xml
@@ -46,7 +46,7 @@
 		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
-		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" property-ref="head" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -62,7 +62,7 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_e_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
-		<many-to-one name="leftArm" entity-name="Arm" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
index bb6e9638f..7b42701be 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_e_o_hibernate.hbm.xml
@@ -43,7 +43,7 @@
 		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
-		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" property-ref="head" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -58,7 +58,7 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_e_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
-		<many-to-one name="leftArm" entity-name="Arm" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
index bb6e9638f..7b42701be 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_s_o_hibernate.hbm.xml
@@ -43,7 +43,7 @@
 		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
-		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" property-ref="head" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -58,7 +58,7 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_e_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
-		<many-to-one name="leftArm" entity-name="Arm" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
+		<many-to-one name="leftArm" entity-name="Arm" not-null="false" foreign-key="person_leftarm" lazy="false" insert="true" update="true"/>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
index 81d32b705..64932f51f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xjoin_hibernate.hbm.xml
@@ -43,7 +43,7 @@
 		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
-		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" property-ref="head" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -58,7 +58,7 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_e_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
 		<many-to-one name="leftArm" entity-name="Arm" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
 		</many-to-one>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
index e0386e72c..844bd24f7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/ToOneAction_mysql_xsingle_hibernate.hbm.xml
@@ -46,7 +46,7 @@
 		<property name="hairColor" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`haircolor`"/>
 		</property>
-		<many-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/>
+		<one-to-one name="person" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" property-ref="head" lazy="false"/>
 	</class>
 	<class name="org.eclipse.emf.teneo.samples.emf.annotations.toone.impl.PersonImpl" entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`">
 		<meta attribute="eclassName">Person</meta>
@@ -62,7 +62,7 @@
 		<many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_address" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_address_e_id`"/>
 		</many-to-one>
-		<one-to-one name="head" entity-name="Head" cascade="all" property-ref="person" lazy="false"/>
+		<many-to-one name="head" entity-name="Head" cascade="all" not-null="false" lazy="false" insert="true" update="true"/>
 		<many-to-one name="leftArm" entity-name="Arm" cascade="merge,persist,save-update,lock,refresh" foreign-key="person_leftarm" lazy="false" insert="true" update="true" not-null="true">
 			<column not-null="true" unique="false" name="`arm_leftarm_e_id`"/>
 		</many-to-one>