[162339]

2 files changed, 68 insertions, 24 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
index 0bdca8c9b..9d26fb452 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_a_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Sun Nov 12 00:57:48 CET 2006 -->
+<!--	Generated by Teneo on Mon Nov 13 15:29:10 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -29,8 +29,12 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/>
-		<property name="longName" type="java.lang.String" lazy="false" column="`longname`" not-null="false"/>
+		<property name="name" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="longName" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`longname`"/>
+		</property>
 	</class>
 	<class entity-name="AddressGroup" abstract="false" lazy="false" discriminator-value="AddressGroup" table="`addressgroup`">
 		<meta attribute="eclassName">AddressGroup</meta>
@@ -43,14 +47,18 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/>
+		<property name="groupName" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`groupname`"/>
+		</property>
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_shipto_id`"/>
 		</many-to-one>
 		<many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_billto_id`"/>
 		</many-to-one>
-		<property name="simpleAddress" type="java.lang.String" lazy="false" column="`simpleaddress`" not-null="false"/>
+		<property name="simpleAddress" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`simpleaddress`"/>
+		</property>
 	</class>
 	<class entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`">
 		<meta attribute="eclassName">AddressList</meta>
@@ -63,7 +71,9 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/>
+		<property name="groupName" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`groupname`"/>
+		</property>
 		<list name="addrs" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`addresslist_addrs_id`" not-null="false" unique="false"/>
@@ -112,9 +122,15 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" type="java.lang.String" lazy="false" column="`aaa`" not-null="false"/>
-		<property name="bbb" type="java.lang.String" lazy="false" column="`bbb`" not-null="false"/>
-		<property name="ccc" type="java.lang.String" lazy="false" column="`ccc`" not-null="false"/>
+		<property name="aaa" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`ccc`"/>
+		</property>
 	</class>
 	<class entity-name="SimpleAllType" abstract="false" lazy="false" discriminator-value="SimpleAllType" table="`simplealltype`">
 		<meta attribute="eclassName">SimpleAllType</meta>
@@ -127,8 +143,14 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="aaa" type="java.lang.String" lazy="false" column="`aaa`" not-null="true"/>
-		<property name="bbb" type="java.lang.String" lazy="false" column="`bbb`" not-null="true"/>
-		<property name="ccc" type="java.lang.String" lazy="false" column="`ccc`" not-null="true"/>
+		<property name="aaa" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`ccc`"/>
+		</property>
 	</class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
index 22cde7455..505178f30 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.GroupAction/mysql_s_o/hibernate.hbm.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
-<!--	Generated by Teneo on Sun Nov 12 00:57:39 CET 2006 -->
+<!--	Generated by Teneo on Mon Nov 13 15:28:59 CET 2006 -->
 <hibernate-mapping>
 	<class entity-name="Address" abstract="false" lazy="false" table="`address`">
 		<meta attribute="eclassName">Address</meta>
@@ -28,8 +28,12 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/>
-		<property name="longName" type="java.lang.String" lazy="false" column="`longname`" not-null="false"/>
+		<property name="name" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`name`"/>
+		</property>
+		<property name="longName" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`longname`"/>
+		</property>
 	</class>
 	<class entity-name="AddressGroup" abstract="false" lazy="false" table="`addressgroup`">
 		<meta attribute="eclassName">AddressGroup</meta>
@@ -41,14 +45,18 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/>
+		<property name="groupName" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`groupname`"/>
+		</property>
 		<many-to-one name="shipTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_shipto_id`"/>
 		</many-to-one>
 		<many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false">
 			<column not-null="false" unique="false" name="`address_billto_id`"/>
 		</many-to-one>
-		<property name="simpleAddress" type="java.lang.String" lazy="false" column="`simpleaddress`" not-null="false"/>
+		<property name="simpleAddress" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`simpleaddress`"/>
+		</property>
 	</class>
 	<class entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`">
 		<meta attribute="eclassName">AddressList</meta>
@@ -60,7 +68,9 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/>
+		<property name="groupName" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`groupname`"/>
+		</property>
 		<list name="addrs" lazy="true" cascade="all,delete-orphan">
 			<key update="true">
 				<column name="`addresslist_addrs_id`" not-null="false" unique="false"/>
@@ -108,9 +118,15 @@
 		</id>
 		<version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/>
 		<property name="fme_feature" type="java.lang.String"/>
-		<property name="aaa" type="java.lang.String" lazy="false" column="`aaa`" not-null="false"/>
-		<property name="bbb" type="java.lang.String" lazy="false" column="`bbb`" not-null="false"/>
-		<property name="ccc" type="java.lang.String" lazy="false" column="`ccc`" not-null="false"/>
+		<property name="aaa" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" type="java.lang.String" lazy="false" not-null="false">
+			<column not-null="false" unique="false" name="`ccc`"/>
+		</property>
 	</class>
 	<class entity-name="SimpleAllType" abstract="false" lazy="false" table="`simplealltype`">
 		<meta attribute="eclassName">SimpleAllType</meta>
@@ -122,8 +138,14 @@
 		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
-		<property name="aaa" type="java.lang.String" lazy="false" column="`aaa`" not-null="true"/>
-		<property name="bbb" type="java.lang.String" lazy="false" column="`bbb`" not-null="true"/>
-		<property name="ccc" type="java.lang.String" lazy="false" column="`ccc`" not-null="true"/>
+		<property name="aaa" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`aaa`"/>
+		</property>
+		<property name="bbb" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`bbb`"/>
+		</property>
+		<property name="ccc" type="java.lang.String" lazy="false" not-null="true">
+			<column not-null="false" unique="false" name="`ccc`"/>
+		</property>
 	</class>
 </hibernate-mapping>
\ No newline at end of file