diff options
| author | mtaal | 2006-11-13 14:52:20 +0000 |
|---|---|---|
| committer | mtaal | 2006-11-13 14:52:20 +0000 |
| commit | ac07cab0fc78e3c3592fd67061492bafd1a2b738 (patch) | |
| tree | cb449fed3a9e91299ad6cb19d1cd91742b88213f /tests | |
| parent | 06dec04923c8301d89a422bcc0c9af11e77654de (diff) | |
| download | org.eclipse.emf.teneo-ac07cab0fc78e3c3592fd67061492bafd1a2b738.tar.gz org.eclipse.emf.teneo-ac07cab0fc78e3c3592fd67061492bafd1a2b738.tar.xz org.eclipse.emf.teneo-ac07cab0fc78e3c3592fd67061492bafd1a2b738.zip | |
[162339]
Diffstat (limited to 'tests')
179 files changed, 3721 insertions, 1156 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml index 84f1ec08e..ae7d8b4d7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,13 @@ <?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:56:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:10 CET 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <meta attribute="eclassName">IdentityID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="identity"/> </id> <discriminator column="`dtype`" type="string"/> @@ -29,7 +30,8 @@ <class entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`"> <meta attribute="eclassName">TableID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="hilo"> <param name="table">hilo_table</param> <param name="column">the_hilo_column</param> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml index 1b24b49de..cddbb35ad 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.HbIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,13 @@ <?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:56:10 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:49 CET 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <meta attribute="eclassName">IdentityID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="identity"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> @@ -27,7 +28,8 @@ <class entity-name="TableID" abstract="false" lazy="false" table="`tableid`"> <meta attribute="eclassName">TableID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/hb/generator/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="hilo"> <param name="table">hilo_table</param> <param name="column">the_hilo_column</param> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml index d0043d7bb..44f74cb21 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,14 +1,18 @@ <?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:56:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:11 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> - <key-property name="firstName" type="java.lang.String" column="`firstname`"/> - <key-property name="lastName" type="java.lang.String" column="`lastname`"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <discriminator column="`dtype`" type="string"/> <version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml index 4c1e35f01..2a6952e3d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.JoinColumnsTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,14 +1,18 @@ <?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:56:11 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:50 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/joincolumns</meta> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> - <key-property name="firstName" type="java.lang.String" column="`firstname`"/> - <key-property name="lastName" type="java.lang.String" column="`lastname`"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <version name="myversion" column="myversion" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml index 704fe7408..fc8b3a0f0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,17 @@ <?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:56:26 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:08 CET 2006 --> <hibernate-mapping> + <typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/> + <typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param> + <param name="edatatype">PhoneNumber</param> + </typedef> + <typedef name="intArrayType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param> + <param name="edatatype">IntArray</param> + </typedef> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta> @@ -14,9 +23,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType" lazy="false" not-null="false" insert="true" update="true" unique="false"> + <property name="name" type="nameType" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`first_name`"/> <column not-null="false" unique="false" name="`last_name`"/> </property> + <property name="numbers" type="intArrayType" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`numbers`"/> + </property> + <list name="phoneNumbers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`person_phonenumbers_id`" not-null="true" unique="false"/> + </key> + <list-index column="`person_phonenumbers_idx`"/> + <element type="usertype.PhoneNumber"> + <column not-null="false" unique="false" name="`phonenumbers`"/> + </element> + </list> + <property name="emergencyContact" type="usertype.PhoneNumber" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`emergencycontact`"/> + </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.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml index 530c8ec23..231db0b03 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.annotations.UserTypeAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,17 @@ <?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:56:14 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:42 CET 2006 --> <hibernate-mapping> + <typedef name="nameType" class="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType"/> + <typedef name="usertype.PhoneNumber" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param> + <param name="edatatype">PhoneNumber</param> + </typedef> + <typedef name="intArrayType" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.elver.org/samples/emf/hibernate/usertype</param> + <param name="edatatype">IntArray</param> + </typedef> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.elver.org/samples/emf/hibernate/usertype</meta> @@ -13,9 +22,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType" lazy="false" not-null="false" insert="true" update="true" unique="false"> + <property name="name" type="nameType" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`first_name`"/> <column not-null="false" unique="false" name="`last_name`"/> </property> + <property name="numbers" type="intArrayType" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`numbers`"/> + </property> + <list name="phoneNumbers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`person_phonenumbers_id`" not-null="true" unique="false"/> + </key> + <list-index column="`person_phonenumbers_idx`"/> + <element type="usertype.PhoneNumber"> + <column not-null="false" unique="false" name="`phonenumbers`"/> + </element> + </list> + <property name="emergencyContact" type="usertype.PhoneNumber" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`emergencycontact`"/> + </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.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml index b91319022..6112da5b4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/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:56:36 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:29 CET 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <meta attribute="eclassName">Contacts</meta> @@ -33,7 +33,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_phones_id`" not-null="false" unique="false"/> @@ -49,10 +51,18 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="office" type="java.lang.String" lazy="false" column="`office`" not-null="false"/> - <property name="mobile" type="java.lang.String" lazy="false" column="`mobile`" not-null="false"/> - <property name="fax" type="java.lang.String" lazy="false" column="`fax`" not-null="false"/> - <property name="home" type="java.lang.String" lazy="false" column="`home`" not-null="false"/> + <property name="office" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`office`"/> + </property> + <property name="mobile" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mobile`"/> + </property> + <property name="fax" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`fax`"/> + </property> + <property name="home" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`home`"/> + </property> </class> <subclass entity-name="SpecialPerson" abstract="false" lazy="false" extends="Person" discriminator-value="SpecialPerson"> <meta attribute="eclassName">SpecialPerson</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml index 7f2905d82..ecf882e37 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachFeatureMapTest$1/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:56:34 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:27 CET 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <meta attribute="eclassName">Contacts</meta> @@ -31,7 +31,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_phones_id`" not-null="false" unique="false"/> @@ -47,10 +49,18 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="office" type="java.lang.String" lazy="false" column="`office`" not-null="false"/> - <property name="mobile" type="java.lang.String" lazy="false" column="`mobile`" not-null="false"/> - <property name="fax" type="java.lang.String" lazy="false" column="`fax`" not-null="false"/> - <property name="home" type="java.lang.String" lazy="false" column="`home`" not-null="false"/> + <property name="office" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`office`"/> + </property> + <property name="mobile" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mobile`"/> + </property> + <property name="fax" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`fax`"/> + </property> + <property name="home" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`home`"/> + </property> </class> <joined-subclass entity-name="SpecialPerson" abstract="false" lazy="false" extends="Person" table="`specialperson`"> <meta attribute="eclassName">SpecialPerson</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml index d3eac2813..3656f6681 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/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:56:36 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:29 CET 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`"> <meta attribute="eclassName">TestA</meta> @@ -14,7 +14,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="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> <many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> @@ -30,7 +32,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="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> </class> <class entity-name="TestC" abstract="false" lazy="false" discriminator-value="TestC" table="`testc`"> <meta attribute="eclassName">TestC</meta> @@ -43,8 +47,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> - <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="myDate" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mydate`"/> + </property> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`testc_testb_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml index 1dc905228..1fbca94f1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.detach.DetachTest$1/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:56:34 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:27 CET 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" table="`testa`"> <meta attribute="eclassName">TestA</meta> @@ -13,7 +13,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="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> <many-to-one name="testB" entity-name="TestB" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> @@ -28,7 +30,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="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> </class> <class entity-name="TestC" abstract="false" lazy="false" table="`testc`"> <meta attribute="eclassName">TestC</meta> @@ -40,8 +44,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> - <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> + <property name="code" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="myDate" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mydate`"/> + </property> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`testc_testb_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml index 3420b45a1..f28e664ad 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/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 01:10:16 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:34 CET 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`"> <meta attribute="eclassName">Account</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="AccountGroup" abstract="false" lazy="false" discriminator-value="AccountGroup" table="`accountgroup`"> <meta attribute="eclassName">AccountGroup</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`accountgroup_account_id`" not-null="false" unique="false"/> @@ -47,7 +51,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> @@ -100,7 +106,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> @@ -127,9 +135,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> - <property name="date" type="date" lazy="false" column="`date`" not-null="true"/> - <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> + <property name="date" type="timestamp" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`date`"/> + </property> + <property name="amount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`amount`"/> + </property> <many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> @@ -155,7 +169,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> @@ -174,7 +190,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> @@ -203,7 +221,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="rate" type="float" lazy="false" column="`rate`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="rate" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`rate`"/> + </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.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml index aa7c39543..296327aa9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.AccountingTest$1/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 01:09:51 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:00 CET 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" table="`account`"> <meta attribute="eclassName">Account</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="AccountGroup" abstract="false" lazy="false" table="`accountgroup`"> <meta attribute="eclassName">AccountGroup</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`accountgroup_account_id`" not-null="false" unique="false"/> @@ -44,7 +48,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> @@ -99,7 +105,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> @@ -125,9 +133,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> - <property name="date" type="date" lazy="false" column="`date`" not-null="true"/> - <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> + <property name="date" type="timestamp" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`date`"/> + </property> + <property name="amount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`amount`"/> + </property> <many-to-one name="debitAccount" entity-name="Account" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> @@ -155,7 +169,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="debitReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> @@ -173,7 +189,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> @@ -201,7 +219,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="rate" type="float" lazy="false" column="`rate`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="rate" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`rate`"/> + </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.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml index df455f4eb..4f9c96489 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/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 01:10:14 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:32 CET 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`"> <meta attribute="eclassName">CapacityEntry</meta> @@ -14,8 +14,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="capacityEntryId" type="java.lang.String" lazy="false" column="`capacityentryid`" not-null="false"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="capacityEntryId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`capacityentryid`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Machine" abstract="false" lazy="false" discriminator-value="Machine" table="`machine`"> <meta attribute="eclassName">Machine</meta> @@ -31,10 +35,18 @@ <many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`workweek_workweek_id`"/> </many-to-one> - <property name="machineId" type="java.lang.String" lazy="false" column="`machineid`" not-null="false"/> - <property name="machineSearchString" type="java.lang.String" lazy="false" column="`machinesearchstring`" not-null="false"/> - <property name="multiplicity" type="int" lazy="false" column="`multiplicity`" not-null="false"/> - <property name="taskSearchString" type="java.lang.String" lazy="false" column="`tasksearchstring`" not-null="false"/> + <property name="machineId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`machineid`"/> + </property> + <property name="machineSearchString" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`machinesearchstring`"/> + </property> + <property name="multiplicity" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`multiplicity`"/> + </property> + <property name="taskSearchString" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`tasksearchstring`"/> + </property> </class> <class entity-name="MachineList" abstract="false" lazy="false" discriminator-value="MachineList" table="`machinelist`"> <meta attribute="eclassName">MachineList</meta> @@ -66,12 +78,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="article" type="java.lang.String" lazy="false" column="`article`" not-null="false"/> - <property name="dueTime" type="serializable" lazy="false" column="`duetime`" not-null="false"/> - <property name="missingAmount" type="float" lazy="false" column="`missingamount`" not-null="false"/> - <property name="productionId" type="java.lang.String" lazy="false" column="`productionid`" not-null="false"/> - <property name="startTime" type="serializable" lazy="false" column="`starttime`" not-null="false"/> - <property name="totalAmount" type="float" lazy="false" column="`totalamount`" not-null="false"/> + <property name="article" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`article`"/> + </property> + <property name="dueTime" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`duetime`"/> + </property> + <property name="missingAmount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`missingamount`"/> + </property> + <property name="productionId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productionid`"/> + </property> + <property name="startTime" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`starttime`"/> + </property> + <property name="totalAmount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`totalamount`"/> + </property> </class> <class entity-name="Task" abstract="false" lazy="false" discriminator-value="Task" table="`task`"> <meta attribute="eclassName">Task</meta> @@ -90,10 +114,18 @@ <many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`production_production_id`"/> </many-to-one> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="taskId" type="java.lang.String" lazy="false" column="`taskid`" not-null="false"/> - <property name="timePerPice" type="float" lazy="false" column="`timeperpice`" not-null="false"/> - <property name="timePerPreperation" type="float" lazy="false" column="`timeperpreperation`" 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="taskId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`taskid`"/> + </property> + <property name="timePerPice" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`timeperpice`"/> + </property> + <property name="timePerPreperation" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`timeperpreperation`"/> + </property> </class> <class entity-name="WorkDay" abstract="false" lazy="false" discriminator-value="WorkDay" table="`workday`"> <meta attribute="eclassName">WorkDay</meta> @@ -106,9 +138,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="dayOfWeek" type="int" lazy="false" column="`dayofweek`" not-null="false"/> - <property name="duration" type="int" lazy="false" column="`duration`" not-null="false"/> - <property name="startTime" type="int" lazy="false" column="`starttime`" not-null="false"/> + <property name="dayOfWeek" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`dayofweek`"/> + </property> + <property name="duration" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`duration`"/> + </property> + <property name="startTime" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`starttime`"/> + </property> </class> <class entity-name="WorkWeek" abstract="false" lazy="false" discriminator-value="WorkWeek" table="`workweek`"> <meta attribute="eclassName">WorkWeek</meta> @@ -128,6 +166,8 @@ <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> </list> - <property name="workWeekId" type="java.lang.String" lazy="false" column="`workweekid`" not-null="false"/> + <property name="workWeekId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`workweekid`"/> + </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.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml index 833d6a7c5..cbca69dd7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CapaTest$1/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 01:09:49 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:56 CET 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`"> <meta attribute="eclassName">CapacityEntry</meta> @@ -13,8 +13,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="capacityEntryId" type="java.lang.String" lazy="false" column="`capacityentryid`" not-null="false"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="capacityEntryId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`capacityentryid`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Machine" abstract="false" lazy="false" table="`machine`"> <meta attribute="eclassName">Machine</meta> @@ -29,10 +33,18 @@ <many-to-one name="workWeek" entity-name="WorkWeek" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`workweek_workweek_id`"/> </many-to-one> - <property name="machineId" type="java.lang.String" lazy="false" column="`machineid`" not-null="false"/> - <property name="machineSearchString" type="java.lang.String" lazy="false" column="`machinesearchstring`" not-null="false"/> - <property name="multiplicity" type="int" lazy="false" column="`multiplicity`" not-null="false"/> - <property name="taskSearchString" type="java.lang.String" lazy="false" column="`tasksearchstring`" not-null="false"/> + <property name="machineId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`machineid`"/> + </property> + <property name="machineSearchString" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`machinesearchstring`"/> + </property> + <property name="multiplicity" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`multiplicity`"/> + </property> + <property name="taskSearchString" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`tasksearchstring`"/> + </property> </class> <class entity-name="MachineList" abstract="false" lazy="false" table="`machinelist`"> <meta attribute="eclassName">MachineList</meta> @@ -62,12 +74,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="article" type="java.lang.String" lazy="false" column="`article`" not-null="false"/> - <property name="dueTime" type="serializable" lazy="false" column="`duetime`" not-null="false"/> - <property name="missingAmount" type="float" lazy="false" column="`missingamount`" not-null="false"/> - <property name="productionId" type="java.lang.String" lazy="false" column="`productionid`" not-null="false"/> - <property name="startTime" type="serializable" lazy="false" column="`starttime`" not-null="false"/> - <property name="totalAmount" type="float" lazy="false" column="`totalamount`" not-null="false"/> + <property name="article" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`article`"/> + </property> + <property name="dueTime" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`duetime`"/> + </property> + <property name="missingAmount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`missingamount`"/> + </property> + <property name="productionId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productionid`"/> + </property> + <property name="startTime" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`starttime`"/> + </property> + <property name="totalAmount" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`totalamount`"/> + </property> </class> <class entity-name="Task" abstract="false" lazy="false" table="`task`"> <meta attribute="eclassName">Task</meta> @@ -85,10 +109,18 @@ <many-to-one name="production" entity-name="Production" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`production_production_id`"/> </many-to-one> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="taskId" type="java.lang.String" lazy="false" column="`taskid`" not-null="false"/> - <property name="timePerPice" type="float" lazy="false" column="`timeperpice`" not-null="false"/> - <property name="timePerPreperation" type="float" lazy="false" column="`timeperpreperation`" 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="taskId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`taskid`"/> + </property> + <property name="timePerPice" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`timeperpice`"/> + </property> + <property name="timePerPreperation" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`timeperpreperation`"/> + </property> </class> <class entity-name="WorkDay" abstract="false" lazy="false" table="`workday`"> <meta attribute="eclassName">WorkDay</meta> @@ -100,9 +132,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="dayOfWeek" type="int" lazy="false" column="`dayofweek`" not-null="false"/> - <property name="duration" type="int" lazy="false" column="`duration`" not-null="false"/> - <property name="startTime" type="int" lazy="false" column="`starttime`" not-null="false"/> + <property name="dayOfWeek" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`dayofweek`"/> + </property> + <property name="duration" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`duration`"/> + </property> + <property name="startTime" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`starttime`"/> + </property> </class> <class entity-name="WorkWeek" abstract="false" lazy="false" table="`workweek`"> <meta attribute="eclassName">WorkWeek</meta> @@ -121,6 +159,8 @@ <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> </list> - <property name="workWeekId" type="java.lang.String" lazy="false" column="`workweekid`" not-null="false"/> + <property name="workWeekId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`workweekid`"/> + </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.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml index 706d2012c..08b26462c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,17 +1,21 @@ <?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 01:10:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:40 CET 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <meta attribute="eclassName">CatalogType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> @@ -38,8 +42,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantityTo" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantityto`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> @@ -47,12 +55,16 @@ <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="code" type="java.lang.String" column="`code`"/> + <id name="code" type="java.lang.String"> + <column not-null="false" unique="false" name="`code`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`producttype_remark_code`" not-null="false" unique="false"/> @@ -75,7 +87,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="value" type="java.lang.String" lazy="false" column="`value`" not-null="true"/> + <property name="value" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -88,7 +102,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml index 13d120839..385eeb310 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.CatalogTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,16 +1,20 @@ <?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 01:09:56 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:08 CET 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <meta attribute="eclassName">CatalogType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> @@ -36,8 +40,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantityTo" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantityto`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> @@ -45,11 +53,15 @@ <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="code" type="java.lang.String" column="`code`"/> + <id name="code" type="java.lang.String"> + <column not-null="false" unique="false" name="`code`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`producttype_remark_code`" not-null="false" unique="false"/> @@ -71,7 +83,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="value" type="java.lang.String" lazy="false" column="`value`" not-null="true"/> + <property name="value" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -83,7 +97,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml index c1e70709c..304747009 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:15 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:32 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml index 92025fd70..175abe5e7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.DetachFromSessionAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:50 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:58 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml index d1e401cdf..4633cb629 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/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 01:10:09 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:24 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -17,12 +17,24 @@ <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_order_id`"/> </many-to-one> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> - <property name="quantity" type="int" lazy="false" column="`quantity`" not-null="false"/> - <property name="USPrice" type="int" lazy="false" column="`usprice`" not-null="false"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="shipDate" type="date" lazy="false" column="`shipdate`" not-null="false"/> - <property name="partNum" type="java.lang.String" lazy="false" column="`partnum`" not-null="false"/> + <property name="productName" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="quantity" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="USPrice" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`usprice`"/> + </property> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="shipDate" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> + <property name="partNum" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`partnum`"/> + </property> </class> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -35,16 +47,28 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="country" type="java.lang.String" lazy="false" column="`country`" 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="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`country`"/> + </property> </class> <subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"> <meta attribute="eclassName">USAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/extendedpo2</meta> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="false"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="false"/> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="false"/> - <property name="zip" type="int" lazy="false" column="`zip`" not-null="false"/> + <property name="street" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`city`"/> + </property> + <property name="state" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> + </property> + <property name="zip" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </subclass> <class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -70,9 +94,14 @@ <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> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="orderDate" type="date" lazy="false" column="`orderdate`" not-null="false"/> - <property name="status" lazy="false" not-null="false" column="`status`"> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="orderDate" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`orderdate`"/> + </property> + <property name="status" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`status`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> @@ -95,7 +124,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`supplier_customers_id`" not-null="false" unique="false"/> @@ -122,7 +153,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="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> + <property name="customerID" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`customerid`"/> + </property> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> @@ -134,13 +167,17 @@ <subclass entity-name="GlobalAddress" abstract="false" lazy="false" extends="Address" discriminator-value="GlobalAddress"> <meta attribute="eclassName">GlobalAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/extendedpo2</meta> - <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> + <property name="countryCode" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`countrycode`"/> + </property> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`location`"/> + </element> </list> </subclass> <class entity-name="GlobalLocation" abstract="false" lazy="false" discriminator-value="GlobalLocation" table="`globallocation`"> @@ -154,6 +191,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> + <property name="countryCode" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`countrycode`"/> + </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.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml index 1ad2af400..e9dd44a3b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.ExtendedPO2Test$1/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 01:09:42 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:50 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -16,12 +16,24 @@ <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_order_id`"/> </many-to-one> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> - <property name="quantity" type="int" lazy="false" column="`quantity`" not-null="false"/> - <property name="USPrice" type="int" lazy="false" column="`usprice`" not-null="false"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="shipDate" type="date" lazy="false" column="`shipdate`" not-null="false"/> - <property name="partNum" type="java.lang.String" lazy="false" column="`partnum`" not-null="false"/> + <property name="productName" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="quantity" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="USPrice" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`usprice`"/> + </property> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="shipDate" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> + <property name="partNum" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`partnum`"/> + </property> </class> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -33,8 +45,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="country" type="java.lang.String" lazy="false" column="`country`" 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="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`country`"/> + </property> </class> <joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -42,10 +58,18 @@ <key> <column name="`address_id`"/> </key> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="false"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="false"/> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="false"/> - <property name="zip" type="int" lazy="false" column="`zip`" not-null="false"/> + <property name="street" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`city`"/> + </property> + <property name="state" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> + </property> + <property name="zip" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </joined-subclass> <class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -70,9 +94,14 @@ <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> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="orderDate" type="date" lazy="false" column="`orderdate`" not-null="false"/> - <property name="status" lazy="false" not-null="false" column="`status`"> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="orderDate" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`orderdate`"/> + </property> + <property name="status" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`status`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> @@ -94,7 +123,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`supplier_customers_id`" not-null="false" unique="false"/> @@ -120,7 +151,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="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> + <property name="customerID" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`customerid`"/> + </property> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> @@ -135,13 +168,17 @@ <key> <column name="`address_id`"/> </key> - <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> + <property name="countryCode" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`countrycode`"/> + </property> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`location`"/> + </element> </list> </joined-subclass> <class entity-name="GlobalLocation" abstract="false" lazy="false" table="`globallocation`"> @@ -154,6 +191,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> + <property name="countryCode" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`countrycode`"/> + </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.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml index f203fa3da..10a5e1649 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:12 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:28 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml index c61b679c1..3140e4c0c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibrarySessionControllerAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:47 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:55 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml index c9802ba8d..5cdb3e1c5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:20 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:38 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -15,9 +19,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -38,7 +47,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -68,7 +79,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key update="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml index 4d83a83cd..f9d212b1d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:55 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:06 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -65,7 +76,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key update="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml index 7cacbd8eb..e1d26c859 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:24 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:42 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml index 29dea4cba..4c2ca7e63 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.LibraryValidateResourceTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:59 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:12 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml index 6fbbc5d57..88e53f4ff 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/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 01:10:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:39 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> @@ -14,9 +14,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> @@ -36,7 +41,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +70,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> @@ -83,16 +92,22 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="value" type="float" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <subclass entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" discriminator-value="SchoolBook"> <meta attribute="eclassName">SchoolBook</meta> <meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta> - <property name="value" type="float" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </subclass> <subclass entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" discriminator-value="SchoolLibrary"> <meta attribute="eclassName">SchoolLibrary</meta> <meta attribute="epackage">http:///org/elver/store/test/emf/sample/schoollibrary/schoollibrary.ecore</meta> - <property name="location" type="java.lang.String" lazy="false" column="`location`" not-null="false"/> + <property name="location" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`location`"/> + </property> </subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml index 135060791..0444c469a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.sample.SchoolLibraryTest$1/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 01:09:56 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:07 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> @@ -13,9 +13,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> @@ -34,7 +39,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,7 +67,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> @@ -79,7 +88,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="value" type="float" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <joined-subclass entity-name="SchoolBook" abstract="false" lazy="false" extends="Book" table="`schoolbook`"> <meta attribute="eclassName">SchoolBook</meta> @@ -87,7 +98,9 @@ <key> <column name="`book_id`"/> </key> - <property name="value" type="float" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </joined-subclass> <joined-subclass entity-name="SchoolLibrary" abstract="false" lazy="false" extends="Library" table="`schoollibrary`"> <meta attribute="eclassName">SchoolLibrary</meta> @@ -95,6 +108,8 @@ <key> <column name="`library_id`"/> </key> - <property name="location" type="java.lang.String" lazy="false" column="`location`" not-null="false"/> + <property name="location" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`location`"/> + </property> </joined-subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml index c8cd0d0ea..cf93d1c4d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_a_o/hibernate.hbm.xml @@ -1,21 +1,33 @@ <?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:09 CET 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <meta attribute="eclassName">A</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/attributes</meta> - <id name="id" type="java.lang.String" column="`id`"/> + <id name="id" type="java.lang.String"> + <column not-null="false" unique="false" name="`id`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="b" type="long" lazy="false" column="`b`" not-null="false"/> - <property name="c" type="java.lang.String" lazy="false" column="`c`" not-null="false"/> - <property name="comment" type="double" lazy="false" column="`comment`" not-null="false"/> - <property name="d" type="java.lang.String" lazy="false" column="`d`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="b" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`b`"/> + </property> + <property name="c" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`c`"/> + </property> + <property name="comment" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="d" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`d`"/> + </property> <many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> @@ -31,6 +43,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </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.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml index 0548f7c61..aa454d337 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs.AttributesTest$1/mysql_s_o/hibernate.hbm.xml @@ -1,20 +1,32 @@ <?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:38 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:57 CET 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <meta attribute="eclassName">A</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/attributes</meta> - <id name="id" type="java.lang.String" column="`id`"/> + <id name="id" type="java.lang.String"> + <column not-null="false" unique="false" name="`id`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="b" type="long" lazy="false" column="`b`" not-null="false"/> - <property name="c" type="java.lang.String" lazy="false" column="`c`" not-null="false"/> - <property name="comment" type="double" lazy="false" column="`comment`" not-null="false"/> - <property name="d" type="java.lang.String" lazy="false" column="`d`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="b" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`b`"/> + </property> + <property name="c" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`c`"/> + </property> + <property name="comment" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="d" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`d`"/> + </property> <many-to-one name="myR" entity-name="R" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> @@ -29,6 +41,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </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.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml index bd8576497..71643bcee 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/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:56:28 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:19 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -14,35 +14,51 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="postalCode" type="java.lang.String" lazy="false" column="`postalcode`" not-null="true"/> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="postalCode" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`postalcode`"/> + </property> </class> <class entity-name="Employee" abstract="false" lazy="false" discriminator-value="Employee" table="`employee`"> <meta attribute="eclassName">Employee</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta> - <id name="id" type="long" column="`id`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`employee_address_id`"/> </many-to-one> - <property name="department" type="java.lang.String" lazy="false" column="`department`" not-null="true"/> + <property name="department" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`department`"/> + </property> </class> <class entity-name="Student" abstract="false" lazy="false" discriminator-value="Student" table="`student`"> <meta attribute="eclassName">Student</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta> - <id name="id" type="long" column="`id`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> - <property name="faculty" type="java.lang.String" lazy="false" column="`faculty`" not-null="true"/> + <property name="faculty" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`faculty`"/> + </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.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml index 420018ed0..fcbbb70ba 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AssociationOverrideAction/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:56:17 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:00 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -13,33 +13,49 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="postalCode" type="java.lang.String" lazy="false" column="`postalcode`" not-null="true"/> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="postalCode" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`postalcode`"/> + </property> </class> <class entity-name="Employee" abstract="false" lazy="false" table="`employee`"> <meta attribute="eclassName">Employee</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta> - <id name="id" type="long" column="`id`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`employee_address_id`"/> </many-to-one> - <property name="department" type="java.lang.String" lazy="false" column="`department`" not-null="true"/> + <property name="department" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`department`"/> + </property> </class> <class entity-name="Student" abstract="false" lazy="false" table="`student`"> <meta attribute="eclassName">Student</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/associationoverride</meta> - <id name="id" type="long" column="`id`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="address" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> - <property name="faculty" type="java.lang.String" lazy="false" column="`faculty`" not-null="true"/> + <property name="faculty" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`faculty`"/> + </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.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml index a23a20d3b..01b276308 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/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:56:32 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:25 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -14,12 +14,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <component name="bornIn" class="City"> <property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false"> <column not-null="false" unique="false" name="`bornnamecolumn`"/> </property> - <property name="country" type="java.lang.String" lazy="false" column="`bornin_country`" not-null="false"/> + <property name="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`bornin_country`"/> + </property> </component> <component name="livesIn" class="City"> <property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml index 2d7a9d47d..cc6cb2d05 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.AttributeOverridesAction/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:56:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:07 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -13,12 +13,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <component name="bornIn" class="City"> <property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false"> <column not-null="false" unique="false" name="`bornnamecolumn`"/> </property> - <property name="country" type="java.lang.String" lazy="false" column="`bornin_country`" not-null="false"/> + <property name="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`bornin_country`"/> + </property> </component> <component name="livesIn" class="City"> <property name="name" type="java.lang.String" lazy="false" insert="true" update="true" not-null="false" unique="false"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml index 52445c648..a23289422 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/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:56:29 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:20 CET 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`"> <meta attribute="eclassName">Basic</meta> @@ -12,6 +12,8 @@ </id> <discriminator column="`dtype`" type="string"/> <version name="myVersion" type="long"/> - <property name="myOptionalBasic" type="java.lang.String" lazy="false" column="`myoptionalbasic`" not-null="false"/> + <property name="myOptionalBasic" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myoptionalbasic`"/> + </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.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml index 122d3add3..207e517c1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BasicAction/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:56:18 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:02 CET 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" table="`basic`"> <meta attribute="eclassName">Basic</meta> @@ -11,6 +11,8 @@ <generator class="native"/> </id> <version name="myVersion" type="long"/> - <property name="myOptionalBasic" type="java.lang.String" lazy="false" column="`myoptionalbasic`" not-null="false"/> + <property name="myOptionalBasic" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myoptionalbasic`"/> + </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.annotations.BookAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml index b9de09822..2fbb3936d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/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:56:26 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:15 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <meta attribute="eclassName">Book</meta> @@ -23,6 +23,8 @@ <property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/> </property> - <property name="author" type="java.lang.String" lazy="false" column="`author`" not-null="true"/> + <property name="author" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`author`"/> + </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.annotations.BookAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml index dbb5c5d37..5238f6a9f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.BookAction/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:56:14 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:55 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <meta attribute="eclassName">Book</meta> @@ -22,6 +22,8 @@ <property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/> </property> - <property name="author" type="java.lang.String" lazy="false" column="`author`" not-null="true"/> + <property name="author" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`author`"/> + </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.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml index a5fe92c48..8b77e90bd 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:30 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:22 CET 2006 --> <hibernate-mapping> + <typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml index bf7b644d8..959ad41f5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CascadeNotallAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:18 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:03 CET 2006 --> <hibernate-mapping> + <typedef name="cascadenotall.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/cascadenotall</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml index e675ca1bd..40cdafa27 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,14 +1,18 @@ <?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:56:31 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:22 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> - <key-property name="firstName" type="java.lang.String" column="`firstname`"/> - <key-property name="lastName" type="java.lang.String" column="`lastname`"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml index b473be879..f06cb37bc 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.CompositeIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,14 +1,18 @@ <?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:56:19 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:03 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http:///org/elver/samples/emf/annotations/compositeid.ecore</meta> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> - <key-property name="firstName" type="java.lang.String" column="`firstname`"/> - <key-property name="lastName" type="java.lang.String" column="`lastname`"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml index f19748469..a4222d1c2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/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:56:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:12 CET 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`"> <meta attribute="eclassName">ChildItem</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="childItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`item_childitem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml index b092506a6..df8dcf9f2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.DuplicatesAction/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:56:11 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:51 CET 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`"> <meta attribute="eclassName">ChildItem</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="childItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`item_childitem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml index 650712b95..e9ae6d0d7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/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:56:26 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:15 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <meta attribute="eclassName">Book</meta> @@ -23,6 +23,8 @@ <property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/> </property> - <property name="author" type="java.lang.String" lazy="false" column="`author`" not-null="true"/> + <property name="author" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`author`"/> + </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.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml index 1e7feee87..11d9eed4e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EDataTypeAction/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:56:14 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:56 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <meta attribute="eclassName">Book</meta> @@ -22,6 +22,8 @@ <property name="weight" type="java.math.BigDecimal" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/> </property> - <property name="author" type="java.lang.String" lazy="false" column="`author`" not-null="true"/> + <property name="author" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`author`"/> + </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.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml index e534a771c..6e0315674 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/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:56:31 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:23 CET 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`"> <meta attribute="eclassName">Embedder</meta> @@ -18,7 +18,9 @@ <property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`columnstring3`"/> </property> - <property name="myInteger" type="int" lazy="false" column="`firstembedded_myinteger`" not-null="false"/> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`firstembedded_myinteger`"/> + </property> </component> <component name="secondEmbedded" class="Embeddable"> <property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false"> @@ -42,13 +44,21 @@ </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> - <property name="myString" type="java.lang.String" lazy="false" column="`mystring`" not-null="true"/> - <property name="myInteger" type="int" lazy="false" column="`myinteger`" not-null="false"/> + <property name="myString" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mystring`"/> + </property> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myinteger`"/> + </property> </composite-element> </list> <component name="fifthEmbedded" class="Embeddable"> - <property name="myString" type="java.lang.String" lazy="false" column="`fifthembedded_mystring`" not-null="true"/> - <property name="myInteger" type="int" lazy="false" column="`fifthembedded_myinteger`" not-null="false"/> + <property name="myString" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`fifthembedded_mystring`"/> + </property> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`fifthembedded_myinteger`"/> + </property> </component> </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.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml index 90dea5e21..b7cad9267 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedAction/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:56:20 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:04 CET 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" table="`embedder`"> <meta attribute="eclassName">Embedder</meta> @@ -17,7 +17,9 @@ <property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false"> <column not-null="false" unique="false" name="`columnstring3`"/> </property> - <property name="myInteger" type="int" lazy="false" column="`firstembedded_myinteger`" not-null="false"/> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`firstembedded_myinteger`"/> + </property> </component> <component name="secondEmbedded" class="Embeddable"> <property name="myString" type="java.lang.String" lazy="false" insert="true" update="true" not-null="true" unique="false"> @@ -41,13 +43,21 @@ </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> - <property name="myString" type="java.lang.String" lazy="false" column="`mystring`" not-null="true"/> - <property name="myInteger" type="int" lazy="false" column="`myinteger`" not-null="false"/> + <property name="myString" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mystring`"/> + </property> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myinteger`"/> + </property> </composite-element> </list> <component name="fifthEmbedded" class="Embeddable"> - <property name="myString" type="java.lang.String" lazy="false" column="`fifthembedded_mystring`" not-null="true"/> - <property name="myInteger" type="int" lazy="false" column="`fifthembedded_myinteger`" not-null="false"/> + <property name="myString" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`fifthembedded_mystring`"/> + </property> + <property name="myInteger" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`fifthembedded_myinteger`"/> + </property> </component> </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.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml index 83bef9009..435effe90 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_a_o/hibernate.hbm.xml @@ -1,19 +1,25 @@ <?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:56:33 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:26 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> - <key-property name="firstName" column="`firstname`" type="java.lang.String"/> - <key-property name="lastName" column="`lastname`" type="java.lang.String"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="address" type="text" lazy="false" column="`address`" not-null="false"/> + <property name="address" type="text" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`address`"/> + </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.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml index f9e3b18a6..f065ad6df 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.EmbeddedIdAction/mysql_s_o/hibernate.hbm.xml @@ -1,18 +1,24 @@ <?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:56:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:07 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/embeddedid</meta> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> - <key-property name="firstName" column="`firstname`" type="java.lang.String"/> - <key-property name="lastName" column="`lastname`" type="java.lang.String"/> + <key-property name="firstName" type="java.lang.String"> + <column not-null="false" unique="false" name="`firstname`"/> + </key-property> + <key-property name="lastName" type="java.lang.String"> + <column not-null="false" unique="false" name="`lastname`"/> + </key-property> </composite-id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="address" type="text" lazy="false" column="`address`" not-null="false"/> + <property name="address" type="text" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`address`"/> + </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.annotations.IdAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml index 64c18df4d..39ff03222 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,13 @@ <?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:56:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:10 CET 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <meta attribute="eclassName">IdentityID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="identity"/> </id> <discriminator column="`dtype`" type="string"/> @@ -29,7 +30,8 @@ <class entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`"> <meta attribute="eclassName">TableID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="hilo"> <param name="table">uid_table</param> <param name="column">next_hi_value_column</param> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml index 6952c7d4b..d74f19b13 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,13 @@ <?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:56:10 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:50 CET 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <meta attribute="eclassName">IdentityID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="identity"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> @@ -27,7 +28,8 @@ <class entity-name="TableID" abstract="false" lazy="false" table="`tableid`"> <meta attribute="eclassName">TableID</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/id</meta> - <id name="myid" type="long" column="`myid`"> + <id name="myid" type="long"> + <column not-null="false" unique="false" name="`myid`"/> <generator class="hilo"> <param name="table">uid_table</param> <param name="column">next_hi_value_column</param> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml index 7da1d6c7d..0ebb247f3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/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:56:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:09 CET 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`"> <meta attribute="eclassName">User</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <idbag name="roles" lazy="true" cascade="all,delete-orphan"> <collection-id column="ID" type="long"> <generator class="increment"/> @@ -22,7 +24,9 @@ <key update="true"> <column name="`user_roles_id`" not-null="true" unique="false"/> </key> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`roles`"/> + </element> </idbag> </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.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml index 7ff45a36f..6dc1fac6d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.IdBagAction/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:56:10 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:49 CET 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" table="`user`"> <meta attribute="eclassName">User</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <idbag name="roles" lazy="true" cascade="all,delete-orphan"> <collection-id column="ID" type="long"> <generator class="increment"/> @@ -21,7 +23,9 @@ <key update="true"> <column name="`user_roles_id`" not-null="true" unique="false"/> </key> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`roles`"/> + </element> </idbag> </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.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml index a1f29306d..a7dcd5c2d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_a_o/hibernate.hbm.xml @@ -1,22 +1,34 @@ <?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:56:25 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:13 CET 2006 --> <hibernate-mapping> + <typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param> + <param name="edatatype">USStateObject</param> + </typedef> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="ContentList" abstract="false" lazy="false" discriminator-value="ContentList" table="`contentlist`"> <meta attribute="eclassName">ContentList</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -42,7 +54,9 @@ <key> <column name="`address_name`"/> </key> - <property name="postcode" type="java.lang.String" lazy="false" column="`postcode`" not-null="true"/> + <property name="postcode" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`postcode`"/> + </property> </joined-subclass> <joined-subclass entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`"> <meta attribute="eclassName">DistrictUKAddress</meta> @@ -50,7 +64,9 @@ <key> <column name="`ukaddress_name`"/> </key> - <property name="district" type="java.lang.String" lazy="false" column="`district`" not-null="false"/> + <property name="district" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`district`"/> + </property> </joined-subclass> <class entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`"> <meta attribute="eclassName">Price</meta> @@ -63,13 +79,19 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="value" type="java.math.BigDecimal" lazy="false" column="`value`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="value" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <subclass entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice"> <meta attribute="eclassName">InternationalPrice</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <property name="currency" type="java.lang.String" lazy="false" column="`currency`" not-null="false"/> + <property name="currency" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`currency`"/> + </property> </subclass> <joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -77,11 +99,14 @@ <key> <column name="`address_name`"/> </key> - <property name="state" lazy="false" not-null="false" column="`state`"> + <property name="state" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param> </type> </property> - <property name="zip" type="java.math.BigInteger" lazy="false" column="`zip`" not-null="false"/> + <property name="zip" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </joined-subclass> </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.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml index 3e0ca013b..3166e3db2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.InheritanceAnnotationAction/mysql_s_o/hibernate.hbm.xml @@ -1,22 +1,34 @@ <?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:56:12 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:53 CET 2006 --> <hibernate-mapping> + <typedef name="inheritancemapping.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</param> + <param name="edatatype">USStateObject</param> + </typedef> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="ContentList" abstract="false" lazy="false" table="`contentlist`"> <meta attribute="eclassName">ContentList</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -41,7 +53,9 @@ <key> <column name="`address_name`"/> </key> - <property name="postcode" type="java.lang.String" lazy="false" column="`postcode`" not-null="true"/> + <property name="postcode" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`postcode`"/> + </property> </joined-subclass> <joined-subclass entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`"> <meta attribute="eclassName">DistrictUKAddress</meta> @@ -49,7 +63,9 @@ <key> <column name="`ukaddress_name`"/> </key> - <property name="district" type="java.lang.String" lazy="false" column="`district`" not-null="false"/> + <property name="district" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`district`"/> + </property> </joined-subclass> <class entity-name="Price" abstract="false" lazy="false" discriminator-value="myPrice" table="`myprice`"> <meta attribute="eclassName">Price</meta> @@ -62,13 +78,19 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="value" type="java.math.BigDecimal" lazy="false" column="`value`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="value" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <subclass entity-name="InternationalPrice" abstract="false" lazy="false" extends="Price" discriminator-value="myInternationalPrice"> <meta attribute="eclassName">InternationalPrice</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/inheritancemapping</meta> - <property name="currency" type="java.lang.String" lazy="false" column="`currency`" not-null="false"/> + <property name="currency" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`currency`"/> + </property> </subclass> <joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -76,11 +98,14 @@ <key> <column name="`address_name`"/> </key> - <property name="state" lazy="false" not-null="false" column="`state`"> + <property name="state" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.inheritancemapping.USState</param> </type> </property> - <property name="zip" type="java.math.BigInteger" lazy="false" column="`zip`" not-null="false"/> + <property name="zip" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </joined-subclass> </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.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml index 721b8cb00..44ca9d58a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:25 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:14 CET 2006 --> <hibernate-mapping> + <typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml index 0ad047890..ccb45d0c3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LazyLibraryAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:13 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:54 CET 2006 --> <hibernate-mapping> + <typedef name="lazy.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/lazy</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml index 73d3ccebf..4c58c1b9e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/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:56:33 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:25 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -14,9 +14,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="id" type="long" lazy="false" column="`id`" not-null="false"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="address" type="text" lazy="false" column="`address`" not-null="false"/> + <property name="id" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`id`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="address" type="text" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`address`"/> + </property> <property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false"> <column not-null="false" unique="false" name="`photo`" length="1000000"/> </property> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml index 0891d0e6c..4ab8a0ed9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.LobAction/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:56:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:07 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -13,9 +13,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="id" type="long" lazy="false" column="`id`" not-null="false"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="address" type="text" lazy="false" column="`address`" not-null="false"/> + <property name="id" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`id`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="address" type="text" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`address`"/> + </property> <property name="photo" type="binary" lazy="false" insert="true" update="true" not-null="false" unique="false"> <column not-null="false" unique="false" name="`photo`" length="1000000"/> </property> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml index e88ea4c32..a5d044fdd 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/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:56:27 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:17 CET 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`"> <meta attribute="eclassName">Cntr</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml index 17ee7fbc3..0556c72c0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ManyToManyAction/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:56:15 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:57 CET 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" table="`cntr`"> <meta attribute="eclassName">Cntr</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml index a23bb737f..22f6d7a06 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/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:56:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:08 CET 2006 --> <hibernate-mapping> <class entity-name="AddIDDocument" abstract="false" lazy="false" discriminator-value="AddIDDocument" table="`addiddocument`"> <meta attribute="eclassName">AddIDDocument</meta> @@ -14,8 +14,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="myGenericInfo" type="java.lang.String" lazy="false" column="`mygenericinfo`" not-null="false"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="myGenericInfo" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mygenericinfo`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`"> <meta attribute="eclassName">SpecificDocument</meta> @@ -28,8 +32,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="myName" type="java.lang.String" lazy="false" column="`myname`" not-null="false"/> - <property name="myGenericInfo" type="java.lang.String" lazy="false" column="`mygenericinfo`" not-null="false"/> - <property name="mySpecificInfo" type="java.lang.String" lazy="false" column="`myspecificinfo`" not-null="true"/> + <property name="myName" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myname`"/> + </property> + <property name="myGenericInfo" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mygenericinfo`"/> + </property> + <property name="mySpecificInfo" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`myspecificinfo`"/> + </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.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml index d26cfe686..117d5f638 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.MappedSuperClassAction/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:56:06 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:45 CET 2006 --> <hibernate-mapping> <class entity-name="AddIDDocument" abstract="false" lazy="false" table="`addiddocument`"> <meta attribute="eclassName">AddIDDocument</meta> @@ -13,8 +13,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="myGenericInfo" type="java.lang.String" lazy="false" column="`mygenericinfo`" not-null="true"/> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="myGenericInfo" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mygenericinfo`"/> + </property> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`"> <meta attribute="eclassName">SpecificDocument</meta> @@ -26,8 +30,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="myName" type="java.lang.String" lazy="false" column="`myname`" not-null="true"/> - <property name="myGenericInfo" type="java.lang.String" lazy="false" column="`mygenericinfo`" not-null="true"/> - <property name="mySpecificInfo" type="java.lang.String" lazy="false" column="`myspecificinfo`" not-null="true"/> + <property name="myName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`myname`"/> + </property> + <property name="myGenericInfo" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`mygenericinfo`"/> + </property> + <property name="mySpecificInfo" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`myspecificinfo`"/> + </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.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml index 4214ed5f0..eda4fb697 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:56:31 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:23 CET 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <meta attribute="eclassName">Body</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta> - <id name="theID" type="long" column="`theid`"/> + <id name="theID" type="long"> + <column not-null="false" unique="false" name="`theid`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -16,7 +18,9 @@ <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta> - <id name="myID" type="long" column="`myid`"/> + <id name="myID" type="long"> + <column not-null="false" unique="false" name="`myid`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml index d495b5995..0d3de32f3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.PKeyJoinAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:56:19 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:04 CET 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <meta attribute="eclassName">Body</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta> - <id name="theID" type="long" column="`theid`"/> + <id name="theID" type="long"> + <column not-null="false" unique="false" name="`theid`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -15,7 +17,9 @@ <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/primarykeyjoin</meta> - <id name="myID" type="long" column="`myid`"/> + <id name="myID" type="long"> + <column not-null="false" unique="false" name="`myid`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml index d70e550cd..9c39f9a89 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_a_o/hibernate.hbm.xml @@ -1,17 +1,21 @@ <?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:56:26 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:16 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta> - <id name="id" type="long" column="`ID`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`ID`"/> + </id> <discriminator column="`DTYPE`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <join table="`PERSON_ADDRESS`"> <key column="`ID`"/> <property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml index 2ce6103cd..6335e949a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SecondarytableHibernateAction/mysql_s_o/hibernate.hbm.xml @@ -1,16 +1,20 @@ <?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:56:15 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:57 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`PERSON`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/secondarytablehibernate</meta> - <id name="id" type="long" column="`ID`"/> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`ID`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <join table="`PERSON_ADDRESS`"> <key column="`ID`"/> <property name="address" type="text" lazy="false" insert="true" update="true" not-null="false" unique="false"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml index b16699dfe..2b7620133 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/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:56:29 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:19 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <meta attribute="eclassName">ContainedItem</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> @@ -43,7 +47,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml index faf77185c..2a2c6d255 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetAction/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:56:17 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:00 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <meta attribute="eclassName">ContainedItem</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> @@ -40,7 +44,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml index 18bc8449a..e72dc721e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/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:56:32 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:24 CET 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`"> <meta attribute="eclassName">MyItem</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="youritem_myitem"> <key update="true"> <column name="`myitem_id`" not-null="true" unique="false"/> @@ -35,7 +37,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> <key update="true"> <column name="`youritem_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml index 3cc6b97bb..6df9e5c3f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetNMAction/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:56:21 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:06 CET 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" table="`myitem`"> <meta attribute="eclassName">MyItem</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="yourItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" inverse="true" table="youritem_myitem"> <key update="true"> <column name="`myitem_id`" not-null="true" unique="false"/> @@ -33,7 +35,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> <key update="true"> <column name="`youritem_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml index a3b5ed848..cf6ecb137 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/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:56:31 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:23 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <meta attribute="eclassName">ContainedItem</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> @@ -43,7 +47,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml index 1bace0035..56932d423 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction/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:56:20 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:05 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <meta attribute="eclassName">ContainedItem</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`item_itemlist_id`"/> </many-to-one> @@ -40,7 +44,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml index 02a52a3cb..d48de00ad 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/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:56:22 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:09 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -14,7 +14,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="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`"> <meta attribute="eclassName">Head</meta> @@ -27,7 +29,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="hairColor" type="java.lang.String" lazy="false" column="`haircolor`" not-null="true"/> + <property name="hairColor" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" 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"/> </class> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml index a820c48e4..9bd3ce2b7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.ToOneAction/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:56:09 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:48 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -13,7 +13,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="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <meta attribute="eclassName">Head</meta> @@ -25,7 +27,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="hairColor" type="java.lang.String" lazy="false" column="`haircolor`" not-null="true"/> + <property name="hairColor" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" 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"/> </class> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml index fc0205401..658f52b0f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:56:29 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:20 CET 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <meta attribute="eclassName">Body</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta> - <id name="theID" type="long" column="`theid`"/> + <id name="theID" type="long"> + <column not-null="false" unique="false" name="`theid`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -15,7 +17,9 @@ <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta> - <id name="myID" type="long" column="`myid`"/> + <id name="myID" type="long"> + <column not-null="false" unique="false" name="`myid`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml index 4eb5b596b..c71ec10c4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.TransientAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:56:18 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:01 CET 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <meta attribute="eclassName">Body</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta> - <id name="theID" type="long" column="`theid`"/> + <id name="theID" type="long"> + <column not-null="false" unique="false" name="`theid`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -14,7 +16,9 @@ <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/annotations/transent</meta> - <id name="myID" type="long" column="`myid`"/> + <id name="myID" type="long"> + <column not-null="false" unique="false" name="`myid`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml index f7df407d2..488db1847 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/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:56:24 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:12 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`"> <meta attribute="eclassName">Item</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml index 89d9a6e65..a51bf3d02 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction/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:56:11 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:26:51 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`myitemtable`"> <meta attribute="eclassName">Item</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml index 50e1b2489..ec5cf865c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/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:56:35 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:28 CET 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <meta attribute="eclassName">Contacts</meta> @@ -40,7 +40,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_children_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml index ef94b04a6..78607ff62 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.detach.DetachEListAction/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:56:34 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:26 CET 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <meta attribute="eclassName">Contacts</meta> @@ -38,7 +38,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_children_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml index 31cc7d895..fe7778769 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:38 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:35 CET 2006 --> <hibernate-mapping> + <typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param> + <param name="edatatype">ProductClassificationObject</param> + </typedef> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`"> <meta attribute="eclassName">PriceByQuantityType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta> @@ -14,13 +18,19 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantity" type="double" lazy="false" column="`quantity`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantity" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> </class> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -32,7 +42,8 @@ <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> </list> - <property name="productClassification" lazy="false" not-null="false" column="`productclassification`"> + <property name="productClassification" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productclassification`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param> </type> @@ -52,7 +63,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> @@ -70,7 +83,9 @@ <many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/> </many-to-one> - <property name="simplePrice" type="double" lazy="false" column="`simpleprice`" not-null="false"/> + <property name="simplePrice" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`simpleprice`"/> + </property> </class> <class entity-name="SupplierPriceType" abstract="false" lazy="false" discriminator-value="SupplierPriceType" table="`supplierpricetype`"> <meta attribute="eclassName">SupplierPriceType</meta> @@ -83,8 +98,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> </class> <class entity-name="TranslatedDescriptionType" abstract="false" lazy="false" discriminator-value="TranslatedDescriptionType" table="`translateddescriptiontype`"> <meta attribute="eclassName">TranslatedDescriptionType</meta> @@ -97,7 +116,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> - <property name="language" type="java.lang.String" lazy="false" column="`language`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> + <property name="language" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`language`"/> + </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.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml index 9098033f3..3395d7dc0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.elist.FeatureMapAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:56:36 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:31 CET 2006 --> <hibernate-mapping> + <typedef name="featuremap.ProductClassificationObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</param> + <param name="edatatype">ProductClassificationObject</param> + </typedef> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`"> <meta attribute="eclassName">PriceByQuantityType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta> @@ -13,13 +17,19 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantity" type="double" lazy="false" column="`quantity`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantity" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> </class> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/elist/featuremap</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -30,7 +40,8 @@ <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> </list> - <property name="productClassification" lazy="false" not-null="false" column="`productclassification`"> + <property name="productClassification" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productclassification`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.elist.featuremap.ProductClassification</param> </type> @@ -50,7 +61,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <many-to-one name="translatedDescription" entity-name="TranslatedDescriptionType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> @@ -68,7 +81,9 @@ <many-to-one name="priceFromSupplier" entity-name="SupplierPriceType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`supplierpricetype_pricefromsupplier_id`"/> </many-to-one> - <property name="simplePrice" type="double" lazy="false" column="`simpleprice`" not-null="false"/> + <property name="simplePrice" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`simpleprice`"/> + </property> </class> <class entity-name="SupplierPriceType" abstract="false" lazy="false" table="`supplierpricetype`"> <meta attribute="eclassName">SupplierPriceType</meta> @@ -80,8 +95,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> </class> <class entity-name="TranslatedDescriptionType" abstract="false" lazy="false" table="`translateddescriptiontype`"> <meta attribute="eclassName">TranslatedDescriptionType</meta> @@ -93,7 +112,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> - <property name="language" type="java.lang.String" lazy="false" column="`language`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> + <property name="language" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`language`"/> + </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.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml index 849dda599..d3d933de6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/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:56:43 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:43 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`"> <meta attribute="eclassName">ContainedChildNR</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="ContainedChildR" abstract="false" lazy="false" discriminator-value="ContainedChildR" table="`containedchildr`"> <meta attribute="eclassName">ContainedChildR</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -40,7 +44,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> @@ -68,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="NotContainedChildNRT" abstract="false" lazy="false" discriminator-value="NotContainedChildNRT" table="`notcontainedchildnrt`"> <meta attribute="eclassName">NotContainedChildNRT</meta> @@ -81,7 +89,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequired" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </class> <class entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" discriminator-value="NotContainedChildNRTNR" table="`notcontainedchildnrtnr`"> @@ -95,7 +105,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </class> <class entity-name="NotContainedChildR" abstract="false" lazy="false" discriminator-value="NotContainedChildR" table="`notcontainedchildr`"> @@ -109,7 +121,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="NotContainedChildRTNR" abstract="false" lazy="false" discriminator-value="NotContainedChildRTNR" table="`notcontainedchildrtnr`"> <meta attribute="eclassName">NotContainedChildRTNR</meta> @@ -122,7 +136,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowayrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </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.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml index 260d486cd..1c70bfde2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1to1Action/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:56:39 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:36 CET 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`"> <meta attribute="eclassName">ContainedChildNR</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="ContainedChildR" abstract="false" lazy="false" table="`containedchildr`"> <meta attribute="eclassName">ContainedChildR</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -37,7 +41,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="containedonewayrequired" entity-name="ContainedChildR" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> @@ -64,7 +70,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="NotContainedChildNRT" abstract="false" lazy="false" table="`notcontainedchildnrt`"> <meta attribute="eclassName">NotContainedChildNRT</meta> @@ -76,7 +84,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequired" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </class> <class entity-name="NotContainedChildNRTNR" abstract="false" lazy="false" table="`notcontainedchildnrtnr`"> @@ -89,7 +99,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowaynotrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </class> <class entity-name="NotContainedChildR" abstract="false" lazy="false" table="`notcontainedchildr`"> @@ -102,7 +114,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="NotContainedChildRTNR" abstract="false" lazy="false" table="`notcontainedchildrtnr`"> <meta attribute="eclassName">NotContainedChildRTNR</meta> @@ -114,7 +128,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <one-to-one name="main" entity-name="Main" property-ref="notcontainedtwowayrequirednr" cascade="merge,persist,save-update,lock,refresh" lazy="false"/> </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.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml index 1ed4b3904..fbd866b44 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/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:56:45 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:46 CET 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`main_onecr_id`" not-null="false" unique="false"/> @@ -83,7 +85,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneCR" abstract="false" lazy="false" discriminator-value="OneCR" table="`onecr`"> <meta attribute="eclassName">OneCR</meta> @@ -96,7 +100,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneNN" abstract="false" lazy="false" discriminator-value="OneNN" table="`onenn`"> <meta attribute="eclassName">OneNN</meta> @@ -109,7 +115,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneNR" abstract="false" lazy="false" discriminator-value="OneNR" table="`onenr`"> <meta attribute="eclassName">OneNR</meta> @@ -122,7 +130,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="TwoCN" abstract="false" lazy="false" discriminator-value="TwoCN" table="`twocn`"> <meta attribute="eclassName">TwoCN</meta> @@ -135,7 +145,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twocn_main_id`"/> </many-to-one> @@ -151,7 +163,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twocr_main_id`"/> </many-to-one> @@ -167,7 +181,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twonn_main_id`"/> </many-to-one> @@ -183,7 +199,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twonr_main_id`"/> </many-to-one> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml index 00db02292..505859c11 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.Relation1tonAction/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:56:40 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:39 CET 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`main_onecr_id`" not-null="false" unique="false"/> @@ -81,7 +83,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneCR" abstract="false" lazy="false" table="`onecr`"> <meta attribute="eclassName">OneCR</meta> @@ -93,7 +97,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneNN" abstract="false" lazy="false" table="`onenn`"> <meta attribute="eclassName">OneNN</meta> @@ -105,7 +111,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="OneNR" abstract="false" lazy="false" table="`onenr`"> <meta attribute="eclassName">OneNR</meta> @@ -117,7 +125,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="TwoCN" abstract="false" lazy="false" table="`twocn`"> <meta attribute="eclassName">TwoCN</meta> @@ -129,7 +139,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twocn_main_id`"/> </many-to-one> @@ -144,7 +156,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twocr_main_id`"/> </many-to-one> @@ -159,7 +173,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twonn_main_id`"/> </many-to-one> @@ -174,7 +190,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`twonr_main_id`"/> </many-to-one> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml index 7e7d177a5..26eb96981 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/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:56:47 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:48 CET 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="main_multinr"> <key update="true"> <column name="`main_id`" not-null="true" unique="false"/> @@ -54,7 +56,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinn_main"> <key update="true"> <column name="`multinn_id`" not-null="true" unique="false"/> @@ -76,7 +80,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinr_main"> <key update="true"> <column name="`multinr_id`" not-null="true" unique="false"/> @@ -98,7 +104,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multirn_main"> <key update="true"> <column name="`multirn_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml index e8dbf46ef..dedc0377d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.relation.RelationntomAction/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:56:42 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:41 CET 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <meta attribute="eclassName">Main</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="multinr" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="main_multinr"> <key update="true"> <column name="`main_id`" not-null="true" unique="false"/> @@ -52,7 +54,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinn_main"> <key update="true"> <column name="`multinn_id`" not-null="true" unique="false"/> @@ -73,7 +77,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multinr_main"> <key update="true"> <column name="`multinr_id`" not-null="true" unique="false"/> @@ -94,7 +100,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="main" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="multirn_main"> <key update="true"> <column name="`multirn_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml index 73d4376c4..e151fefee 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,17 +1,21 @@ <?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 01:10:24 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:43 CET 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <meta attribute="eclassName">CatalogType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> @@ -38,8 +42,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantityTo" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantityto`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> @@ -47,12 +55,16 @@ <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="code" type="java.lang.String" column="`code`"/> + <id name="code" type="java.lang.String"> + <column not-null="false" unique="false" name="`code`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`producttype_remark_code`" not-null="false" unique="false"/> @@ -75,7 +87,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="value" type="java.lang.String" lazy="false" column="`value`" not-null="true"/> + <property name="value" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -88,7 +102,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml index a6f2720ee..b0ba370c0 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,16 +1,20 @@ <?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 01:10:00 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:12 CET 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <meta attribute="eclassName">CatalogType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> + <property name="description" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> @@ -36,8 +40,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="quantityTo" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantityto`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> @@ -45,11 +53,15 @@ <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/catalog</meta> - <id name="code" type="java.lang.String" column="`code`"/> + <id name="code" type="java.lang.String"> + <column not-null="false" unique="false" name="`code`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`producttype_remark_code`" not-null="false" unique="false"/> @@ -71,7 +83,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="value" type="java.lang.String" lazy="false" column="`value`" not-null="true"/> + <property name="value" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -83,7 +97,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml index 4b0523150..9ca4c82a3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/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 01:10:13 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:29 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_group_id`" not-null="false" unique="false"/> @@ -30,7 +32,11 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="age" type="int" lazy="false" column="`age`" not-null="false"/> - <property name="length" type="int" lazy="false" column="`length`" not-null="false"/> + <property name="age" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`age`"/> + </property> + <property name="length" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`length`"/> + </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.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml index c096dd995..30a37ff76 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.DynamicAction/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 01:09:48 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:55 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_group_id`" not-null="false" unique="false"/> @@ -29,7 +31,11 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="age" type="int" lazy="false" column="`age`" not-null="false"/> - <property name="length" type="int" lazy="false" column="`length`" not-null="false"/> + <property name="age" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`age`"/> + </property> + <property name="length" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`length`"/> + </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.sample.ForumAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml index f50587c2d..0fd804711 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:30 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:51 CET 2006 --> <hibernate-mapping> + <typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</param> + <param name="edatatype">TopicCategoryObject</param> + </typedef> <class entity-name="Forum" abstract="false" lazy="false" discriminator-value="Forum" table="`forum`"> <meta attribute="eclassName">Forum</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</meta> @@ -14,7 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`forum_members_id`" not-null="false" unique="false"/> @@ -41,7 +47,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="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> + <property name="nickname" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`nickname`"/> + </property> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`post_author_id`" not-null="false" unique="false"/> @@ -68,7 +76,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="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> + <property name="comment" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`comment`"/> + </property> <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`post_author_id`"/> </many-to-one> @@ -87,8 +97,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml index ae42a4966..7be57386c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ForumAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:08 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:23 CET 2006 --> <hibernate-mapping> + <typedef name="forum.TopicCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</param> + <param name="edatatype">TopicCategoryObject</param> + </typedef> <class entity-name="Forum" abstract="false" lazy="false" table="`forum`"> <meta attribute="eclassName">Forum</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/forum</meta> @@ -13,7 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`forum_members_id`" not-null="false" unique="false"/> @@ -39,7 +45,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="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> + <property name="nickname" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`nickname`"/> + </property> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`post_author_id`" not-null="false" unique="false"/> @@ -65,7 +73,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="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> + <property name="comment" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`comment`"/> + </property> <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`post_author_id`"/> </many-to-one> @@ -83,8 +93,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml index f090cc520..565111e69 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o/hibernate.hbm.xml @@ -1,19 +1,22 @@ <?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 01:10:22 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:41 CET 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`"> <meta attribute="eclassName">PType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta> - <id name="id" type="long" column="`id`"> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> <generator class="native"/> </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`ptype_base_id`"/> </many-to-one> @@ -39,13 +42,16 @@ <class entity-name="PDeclaration" abstract="false" lazy="false" discriminator-value="PDeclaration" table="`pdeclaration`"> <meta attribute="eclassName">PDeclaration</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta> - <id name="id" type="long" column="`id`"> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> <generator class="native"/> </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </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.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml index 9f83c6868..5f8b9f2fe 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o/hibernate.hbm.xml @@ -1,18 +1,21 @@ <?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 01:09:57 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:10 CET 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" table="`ptype`"> <meta attribute="eclassName">PType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta> - <id name="id" type="long" column="`id`"> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> <generator class="native"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> <column not-null="false" unique="false" name="`ptype_base_id`"/> </many-to-one> @@ -38,12 +41,15 @@ <class entity-name="PDeclaration" abstract="false" lazy="false" table="`pdeclaration`"> <meta attribute="eclassName">PDeclaration</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/inv</meta> - <id name="id" type="long" column="`id`"> + <id name="id" type="long"> + <column not-null="false" unique="false" name="`id`"/> <generator class="native"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </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.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml index 6deabb06d..17f1cd145 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:12 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:27 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -15,9 +19,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -38,7 +47,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -68,7 +79,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key update="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml index c27796a05..1653fd29d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:47 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:54 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -65,7 +76,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key update="true"> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml index bbae9f6b3..dee399f8a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:41 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`categ`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`titl"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`page"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`cate"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`li_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`bo_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml index 361b95035..64edf241b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryColLengthAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:58 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:10 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`categ`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`titl"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`page"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`cate"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`li_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`bo_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml index 8c949d03f..9ef7be492 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:25 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:45 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml index e025125dd..010a576fa 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:02 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:14 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml index 2e5800ab1..65d40bba6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:11 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:27 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`BOOK`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -15,9 +19,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="title" type="java.lang.String" lazy="false" column="`TITLE`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`PAGES`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`CATEGORY`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`TITLE`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`PAGES`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`CATEGORY`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -38,7 +47,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="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -68,7 +79,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="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <list name="books" table="WRITER_BOOKS" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml index 6781897c6..58812b05b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryJoinTableNamingAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:46 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:53 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`BOOK`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`TITLE`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`PAGES`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`CATEGORY`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`TITLE`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`PAGES`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`CATEGORY`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <cache usage="read-write"/> <key update="true"> @@ -65,7 +76,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="name" type="java.lang.String" lazy="false" column="`NAME`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`NAME`"/> + </property> <list name="books" table="WRITER_BOOKS" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <cache usage="read-write"/> <key/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml index c1e70709c..8f3a3a688 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:15 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:33 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml index 92025fd70..355bb67cf 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:50 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:59 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml index 6984380b4..04c71301a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:25 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:44 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="library.Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml index 5f989ff00..c9b5e1da6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryQualifyActionHB/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:01 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:14 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="library.Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml index 0ca4bca63..2ad133373 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:26 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:45 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml index 792129ead..eaf6931f3 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:02 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:15 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml index 8b2524550..630b47d40 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:23 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:42 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml index 61996f0a8..3167eb81b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:58 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:11 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml index d04be6567..14bac1d6c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:10:11 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:26 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -14,9 +18,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -36,7 +45,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -63,7 +74,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml index 6d0fe9c99..32f052ff6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.LibrarySerializationAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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 01:09:45 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:27:52 CET 2006 --> <hibernate-mapping> + <typedef name="library.BookCategoryObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param> + <param name="edatatype">BookCategoryObject</param> + </typedef> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta> @@ -13,9 +17,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> - <property name="pages" type="int" lazy="false" column="`pages`" not-null="false"/> - <property name="category" lazy="false" not-null="false" column="`category`"> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="pages" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pages`"/> + </property> + <property name="category" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`category`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> @@ -34,7 +43,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`library_writers_id`" not-null="false" unique="false"/> @@ -60,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`book_author_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml index e54952317..cbad45eec 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/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 01:10:27 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:46 CET 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" discriminator-value="ActType" table="`acttype`"> <meta attribute="eclassName">ActType</meta> @@ -21,8 +21,12 @@ <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> </list> - <property name="pindex" type="byte" lazy="false" column="`pindex`" not-null="false"/> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="pindex" type="byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pindex`"/> + </property> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> </class> <class entity-name="FmType" abstract="false" lazy="false" discriminator-value="FmType" table="`fmtype`"> <meta attribute="eclassName">FmType</meta> @@ -40,7 +44,9 @@ <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`p`"/> + </element> </list> </class> <class entity-name="PersonaeType" abstract="false" lazy="false" discriminator-value="PersonaeType" table="`personaetype`"> @@ -69,8 +75,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> - <property name="persona" type="java.lang.String" lazy="false" column="`persona`" not-null="false"/> + <property name="title" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="persona" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`persona`"/> + </property> <many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> @@ -91,9 +101,13 @@ <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`persona`"/> + </element> </list> - <property name="groupDescription" type="java.lang.String" lazy="false" column="`groupdescription`" not-null="true"/> + <property name="groupDescription" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`groupdescription`"/> + </property> </class> <class entity-name="PlayType" abstract="false" lazy="false" discriminator-value="PlayType" table="`playtype`"> <meta attribute="eclassName">PlayType</meta> @@ -106,15 +120,21 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`fmtype_fm_id`"/> </many-to-one> <many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`personaetype_personae_id`"/> </many-to-one> - <property name="sceneDescription" type="java.lang.String" lazy="false" column="`scenedescription`" not-null="true"/> - <property name="playSubTitle" type="java.lang.String" lazy="false" column="`playsubtitle`" not-null="true"/> + <property name="sceneDescription" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`scenedescription`"/> + </property> + <property name="playSubTitle" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`playsubtitle`"/> + </property> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`playtype_act_id`" not-null="false" unique="false"/> @@ -141,8 +161,12 @@ <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> </list> - <property name="pindex" type="java.lang.String" lazy="false" column="`pindex`" not-null="true"/> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="pindex" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`pindex`"/> + </property> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> </class> <class entity-name="SceneType_group" lazy="false" table="`scenetype_group`"> <meta attribute="featureMap">SceneType</meta> @@ -151,7 +175,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> + <property name="stageDirections" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`stagedirections`"/> + </property> <many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> @@ -182,8 +208,14 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="speaker" type="java.lang.String" lazy="false" column="`speaker`" not-null="false"/> - <property name="line" type="java.lang.String" lazy="false" column="`line`" not-null="false"/> - <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> + <property name="speaker" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`speaker`"/> + </property> + <property name="line" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`line`"/> + </property> + <property name="stageDirections" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`stagedirections`"/> + </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.sample.PlayAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml index 3fee831d2..915917847 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PlayAction/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 01:10:03 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:16 CET 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" table="`acttype`"> <meta attribute="eclassName">ActType</meta> @@ -20,8 +20,12 @@ <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> </list> - <property name="pindex" type="byte" lazy="false" column="`pindex`" not-null="false"/> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="pindex" type="byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`pindex`"/> + </property> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> </class> <class entity-name="FmType" abstract="false" lazy="false" table="`fmtype`"> <meta attribute="eclassName">FmType</meta> @@ -38,7 +42,9 @@ <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`p`"/> + </element> </list> </class> <class entity-name="PersonaeType" abstract="false" lazy="false" table="`personaetype`"> @@ -66,8 +72,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="false"/> - <property name="persona" type="java.lang.String" lazy="false" column="`persona`" not-null="false"/> + <property name="title" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`title`"/> + </property> + <property name="persona" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`persona`"/> + </property> <many-to-one name="personaGroup" entity-name="PersonaGroupType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> @@ -87,9 +97,13 @@ <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`persona`"/> + </element> </list> - <property name="groupDescription" type="java.lang.String" lazy="false" column="`groupdescription`" not-null="true"/> + <property name="groupDescription" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`groupdescription`"/> + </property> </class> <class entity-name="PlayType" abstract="false" lazy="false" table="`playtype`"> <meta attribute="eclassName">PlayType</meta> @@ -101,15 +115,21 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <many-to-one name="fm" entity-name="FmType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`fmtype_fm_id`"/> </many-to-one> <many-to-one name="personae" entity-name="PersonaeType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`personaetype_personae_id`"/> </many-to-one> - <property name="sceneDescription" type="java.lang.String" lazy="false" column="`scenedescription`" not-null="true"/> - <property name="playSubTitle" type="java.lang.String" lazy="false" column="`playsubtitle`" not-null="true"/> + <property name="sceneDescription" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`scenedescription`"/> + </property> + <property name="playSubTitle" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`playsubtitle`"/> + </property> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`playtype_act_id`" not-null="false" unique="false"/> @@ -135,8 +155,12 @@ <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> </list> - <property name="pindex" type="java.lang.String" lazy="false" column="`pindex`" not-null="true"/> - <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="pindex" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`pindex`"/> + </property> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> </class> <class entity-name="SceneType_group" lazy="false" table="`scenetype_group`"> <meta attribute="featureMap">SceneType</meta> @@ -145,7 +169,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> + <property name="stageDirections" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`stagedirections`"/> + </property> <many-to-one name="speech" entity-name="SpeechType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> @@ -175,8 +201,14 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="speaker" type="java.lang.String" lazy="false" column="`speaker`" not-null="false"/> - <property name="line" type="java.lang.String" lazy="false" column="`line`" not-null="false"/> - <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> + <property name="speaker" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`speaker`"/> + </property> + <property name="line" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`line`"/> + </property> + <property name="stageDirections" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`stagedirections`"/> + </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.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml index feda671e2..05121b11b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/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 01:10:28 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:48 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -14,12 +14,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="true"/> - <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="true"/> - <property name="uSPrice" type="java.math.BigDecimal" lazy="false" column="`usprice`" not-null="true"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="shipDate" type="serializable" lazy="false" column="`shipdate`" not-null="false"/> - <property name="partNum" type="java.lang.String" lazy="false" column="`partnum`" not-null="true"/> + <property name="productName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="quantity" type="java.math.BigInteger" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="uSPrice" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`usprice`"/> + </property> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="shipDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> + <property name="partNum" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`partnum`"/> + </property> </class> <class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -38,7 +50,9 @@ <many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`usaddress_billto_id`"/> </many-to-one> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> @@ -46,7 +60,9 @@ <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> - <property name="orderDate" type="serializable" lazy="false" column="`orderdate`" not-null="false"/> + <property name="orderDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`orderdate`"/> + </property> </class> <class entity-name="USAddress" abstract="false" lazy="false" discriminator-value="USAddress" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -59,11 +75,23 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="true"/> - <property name="zip" type="java.math.BigDecimal" lazy="false" column="`zip`" not-null="true"/> - <property name="country" type="java.lang.String" lazy="false" column="`country`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> + <property name="state" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`state`"/> + </property> + <property name="zip" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`zip`"/> + </property> + <property name="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`country`"/> + </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.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml index 3c2d5676f..04a2cd45c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.PrimerPOAction/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 01:10:05 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:18 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -13,12 +13,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="true"/> - <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="true"/> - <property name="uSPrice" type="java.math.BigDecimal" lazy="false" column="`usprice`" not-null="true"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="shipDate" type="serializable" lazy="false" column="`shipdate`" not-null="false"/> - <property name="partNum" type="java.lang.String" lazy="false" column="`partnum`" not-null="true"/> + <property name="productName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="quantity" type="java.math.BigInteger" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="uSPrice" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`usprice`"/> + </property> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="shipDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> + <property name="partNum" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`partnum`"/> + </property> </class> <class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -36,7 +48,9 @@ <many-to-one name="billTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`usaddress_billto_id`"/> </many-to-one> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> + <property name="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> @@ -44,7 +58,9 @@ <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> - <property name="orderDate" type="serializable" lazy="false" column="`orderdate`" not-null="false"/> + <property name="orderDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`orderdate`"/> + </property> </class> <class entity-name="USAddress" abstract="false" lazy="false" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -56,11 +72,23 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="true"/> - <property name="zip" type="java.math.BigDecimal" lazy="false" column="`zip`" not-null="true"/> - <property name="country" type="java.lang.String" lazy="false" column="`country`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> + <property name="state" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`state`"/> + </property> + <property name="zip" type="java.math.BigDecimal" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`zip`"/> + </property> + <property name="country" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`country`"/> + </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.sample.ProductAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml index a51d2864b..08762d850 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_a_o/hibernate.hbm.xml @@ -1,22 +1,30 @@ <?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 01:10:28 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:48 CET 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta> - <id name="id" type="java.lang.String" column="`id`"/> + <id name="id" type="java.lang.String"> + <column not-null="false" unique="false" name="`id`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="createdOn" type="serializable" lazy="false" column="`createdon`" not-null="true"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="createdOn" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`createdon`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" discriminator-value="SupplierType" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -29,7 +37,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.sample.ProductAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml index 7f623f094..4bb7f5b8c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.ProductAction/mysql_s_o/hibernate.hbm.xml @@ -1,21 +1,29 @@ <?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 01:10:05 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:19 CET 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <meta attribute="eclassName">ProductType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/product</meta> - <id name="id" type="java.lang.String" column="`id`"/> + <id name="id" type="java.lang.String"> + <column not-null="false" unique="false" name="`id`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> <many-to-one name="supplier" entity-name="SupplierType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> - <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> - <property name="createdOn" type="serializable" lazy="false" column="`createdon`" not-null="true"/> + <property name="price" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`price`"/> + </property> + <property name="createdOn" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`createdon`"/> + </property> </class> <class entity-name="SupplierType" abstract="false" lazy="false" table="`suppliertype`"> <meta attribute="eclassName">SupplierType</meta> @@ -27,7 +35,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="noOfEmployees" type="int" lazy="false" column="`noofemployees`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="noOfEmployees" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`noofemployees`"/> + </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.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml index 405d6cc65..7d0f9c44d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,16 @@ <?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 01:10:19 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:37 CET 2006 --> <hibernate-mapping> + <typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param> + <param name="edatatype">BookCategoryTypeObject</param> + </typedef> + <typedef name="sunBooks.BookCategoryTypeObject1" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param> + <param name="edatatype">BookCategoryTypeObject1</param> + </typedef> <class entity-name="AuthorsType" abstract="false" lazy="false" discriminator-value="AuthorsType" table="`authorstype`"> <meta attribute="eclassName">AuthorsType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</meta> @@ -19,7 +27,9 @@ <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`authorname`"/> + </element> </list> </class> <class entity-name="BooksType" abstract="false" lazy="false" discriminator-value="BooksType" table="`bookstype`"> @@ -52,23 +62,36 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="iSBN" type="long" lazy="false" column="`isbn`" not-null="false"/> - <property name="price" type="java.lang.String" lazy="false" column="`price`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="iSBN" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`isbn`"/> + </property> + <property name="price" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`price`"/> + </property> <many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`authorstype_authors_id`"/> </many-to-one> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`promotiontype_promotion_id`"/> </many-to-one> - <property name="publicationDate" type="serializable" lazy="false" column="`publicationdate`" not-null="true"/> - <property name="bookCategory" lazy="false" not-null="false" column="`bookcategory`"> + <property name="publicationDate" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`publicationdate`"/> + </property> + <property name="bookCategory" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`bookcategory`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param> </type> </property> - <property name="itemId" type="java.lang.String" lazy="false" column="`itemid`" not-null="false"/> + <property name="itemId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`itemid`"/> + </property> </class> <class entity-name="CollectionType" abstract="false" lazy="false" discriminator-value="CollectionType" table="`collectiontype`"> <meta attribute="eclassName">CollectionType</meta> @@ -96,7 +119,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="discount" type="java.lang.String" lazy="false" column="`discount`" not-null="false"/> - <property name="none" type="java.lang.String" lazy="false" column="`none`" not-null="false"/> + <property name="discount" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`discount`"/> + </property> + <property name="none" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`none`"/> + </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.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml index 08858d12a..586cbcba7 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.SunBooksAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,16 @@ <?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 01:09:54 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:05 CET 2006 --> <hibernate-mapping> + <typedef name="sunBooks.BookCategoryTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param> + <param name="edatatype">BookCategoryTypeObject</param> + </typedef> + <typedef name="sunBooks.BookCategoryTypeObject1" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</param> + <param name="edatatype">BookCategoryTypeObject1</param> + </typedef> <class entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`"> <meta attribute="eclassName">AuthorsType</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/sample/sun_books</meta> @@ -18,7 +26,9 @@ <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`authorname`"/> + </element> </list> </class> <class entity-name="BooksType" abstract="false" lazy="false" table="`bookstype`"> @@ -49,23 +59,36 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="iSBN" type="long" lazy="false" column="`isbn`" not-null="false"/> - <property name="price" type="java.lang.String" lazy="false" column="`price`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="iSBN" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`isbn`"/> + </property> + <property name="price" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`price`"/> + </property> <many-to-one name="authors" entity-name="AuthorsType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`authorstype_authors_id`"/> </many-to-one> - <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> + <property name="description" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`description`"/> + </property> <many-to-one name="promotion" entity-name="PromotionType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`promotiontype_promotion_id`"/> </many-to-one> - <property name="publicationDate" type="serializable" lazy="false" column="`publicationdate`" not-null="true"/> - <property name="bookCategory" lazy="false" not-null="false" column="`bookcategory`"> + <property name="publicationDate" type="serializable" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`publicationdate`"/> + </property> + <property name="bookCategory" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`bookcategory`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.sunBooks.BookCategoryType1</param> </type> </property> - <property name="itemId" type="java.lang.String" lazy="false" column="`itemid`" not-null="false"/> + <property name="itemId" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`itemid`"/> + </property> </class> <class entity-name="CollectionType" abstract="false" lazy="false" table="`collectiontype`"> <meta attribute="eclassName">CollectionType</meta> @@ -91,7 +114,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="discount" type="java.lang.String" lazy="false" column="`discount`" not-null="false"/> - <property name="none" type="java.lang.String" lazy="false" column="`none`" not-null="false"/> + <property name="discount" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`discount`"/> + </property> + <property name="none" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`none`"/> + </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.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml index 80255134e..1ad61f71e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/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 01:10:29 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:48 CET 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`"> <meta attribute="eclassName">WorkflowElement</meta> @@ -14,12 +14,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="x" type="int" lazy="false" column="`x`" not-null="false"/> - <property name="y" type="int" lazy="false" column="`y`" not-null="false"/> - <property name="width" type="int" lazy="false" column="`width`" not-null="false"/> - <property name="height" type="int" lazy="false" column="`height`" 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="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="x" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`x`"/> + </property> + <property name="y" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`y`"/> + </property> + <property name="width" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`width`"/> + </property> + <property name="height" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`height`"/> + </property> </class> <subclass entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Workflow"> <meta attribute="eclassName">Workflow</meta> @@ -66,8 +78,12 @@ <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> </list> - <property name="isStart" type="boolean" lazy="false" column="`isstart`" not-null="false"/> - <property name="isFinish" type="boolean" lazy="false" column="`isfinish`" not-null="false"/> + <property name="isStart" type="boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`isstart`"/> + </property> + <property name="isFinish" type="boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`isfinish`"/> + </property> </subclass> <subclass entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Edge"> <meta attribute="eclassName">Edge</meta> @@ -128,7 +144,9 @@ <subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="TransformationTask"> <meta attribute="eclassName">TransformationTask</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta> - <property name="transformExpression" type="java.lang.String" lazy="false" column="`transformexpression`" not-null="false"/> + <property name="transformExpression" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`transformexpression`"/> + </property> </subclass> <subclass entity-name="ConditionalTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="ConditionalTask"> <meta attribute="eclassName">ConditionalTask</meta> @@ -137,12 +155,16 @@ <subclass entity-name="LoopTask" abstract="false" lazy="false" extends="CompoundTask" discriminator-value="LoopTask"> <meta attribute="eclassName">LoopTask</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta> - <property name="whileCondition" type="java.lang.String" lazy="false" column="`whilecondition`" not-null="false"/> + <property name="whileCondition" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`whilecondition`"/> + </property> </subclass> <subclass entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" discriminator-value="ConditionalOutputPort"> <meta attribute="eclassName">ConditionalOutputPort</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/workflow</meta> - <property name="condition" type="java.lang.String" lazy="false" column="`condition`" not-null="false"/> + <property name="condition" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`condition`"/> + </property> </subclass> <subclass entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Comment"> <meta attribute="eclassName">Comment</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml index 82be09ab0..0fe719d98 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction/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 01:10:06 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:19 CET 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`"> <meta attribute="eclassName">WorkflowElement</meta> @@ -13,12 +13,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="false"/> - <property name="x" type="int" lazy="false" column="`x`" not-null="false"/> - <property name="y" type="int" lazy="false" column="`y`" not-null="false"/> - <property name="width" type="int" lazy="false" column="`width`" not-null="false"/> - <property name="height" type="int" lazy="false" column="`height`" 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="comment" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`comment`"/> + </property> + <property name="x" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`x`"/> + </property> + <property name="y" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`y`"/> + </property> + <property name="width" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`width`"/> + </property> + <property name="height" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`height`"/> + </property> </class> <joined-subclass entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" table="`workflow`"> <meta attribute="eclassName">Workflow</meta> @@ -71,8 +83,12 @@ <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> </list> - <property name="isStart" type="boolean" lazy="false" column="`isstart`" not-null="true"/> - <property name="isFinish" type="boolean" lazy="false" column="`isfinish`" not-null="true"/> + <property name="isStart" type="boolean" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`isstart`"/> + </property> + <property name="isFinish" type="boolean" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`isfinish`"/> + </property> </joined-subclass> <joined-subclass entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" table="`edge`"> <meta attribute="eclassName">Edge</meta> @@ -154,7 +170,9 @@ <key> <column name="`workflownode_id`"/> </key> - <property name="transformExpression" type="java.lang.String" lazy="false" column="`transformexpression`" not-null="false"/> + <property name="transformExpression" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`transformexpression`"/> + </property> </joined-subclass> <joined-subclass entity-name="ConditionalTask" abstract="false" lazy="false" extends="WorkflowNode" table="`conditionaltask`"> <meta attribute="eclassName">ConditionalTask</meta> @@ -169,7 +187,9 @@ <key> <column name="`compoundtask_id`"/> </key> - <property name="whileCondition" type="java.lang.String" lazy="false" column="`whilecondition`" not-null="true"/> + <property name="whileCondition" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`whilecondition`"/> + </property> </joined-subclass> <joined-subclass entity-name="ConditionalOutputPort" abstract="false" lazy="false" extends="OutputPort" table="`conditionaloutputport`"> <meta attribute="eclassName">ConditionalOutputPort</meta> @@ -177,7 +197,9 @@ <key> <column name="`outputport_id`"/> </key> - <property name="condition" type="java.lang.String" lazy="false" column="`condition`" not-null="true"/> + <property name="condition" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`condition`"/> + </property> </joined-subclass> <joined-subclass entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" table="`comment`"> <meta attribute="eclassName">Comment</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml index 2d1b3016a..797584f58 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/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:43 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:03 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <meta attribute="eclassName">Book</meta> @@ -14,7 +14,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`book_writers_id`" not-null="false" unique="false"/> @@ -48,8 +50,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> - <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + <property name="key" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`key`"/> + </property> + <property name="value" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="StringToWriterMapEntry" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntry" table="`stringtowritermapentry`"> <meta attribute="eclassName">StringToWriterMapEntry</meta> @@ -62,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="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> + <property name="key" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`key`"/> + </property> <many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> @@ -78,7 +86,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="WriterToStringMapEntry" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntry" table="`writertostringmapentry`"> <meta attribute="eclassName">WriterToStringMapEntry</meta> @@ -94,6 +104,8 @@ <many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`writer_key_id`"/> </many-to-one> - <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </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.EMapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml index a696bac3d..7e999df38 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EMapAction/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:30 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:52 CET 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <meta attribute="eclassName">Book</meta> @@ -13,7 +13,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="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> + <property name="title" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`title`"/> + </property> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`book_writers_id`" not-null="false" unique="false"/> @@ -46,8 +48,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> - <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + <property name="key" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`key`"/> + </property> + <property name="value" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="StringToWriterMapEntry" abstract="false" lazy="false" table="`stringtowritermapentry`"> <meta attribute="eclassName">StringToWriterMapEntry</meta> @@ -59,7 +65,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="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> + <property name="key" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`key`"/> + </property> <many-to-one name="value" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> @@ -74,7 +82,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="WriterToStringMapEntry" abstract="false" lazy="false" table="`writertostringmapentry`"> <meta attribute="eclassName">WriterToStringMapEntry</meta> @@ -89,6 +99,8 @@ <many-to-one name="key" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`writer_key_id`"/> </many-to-one> - <property name="value" type="java.lang.String" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </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.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml index d80b55081..0417d0a4f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/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:46 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:07 CET 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`"> <meta attribute="eclassName">Element</meta> @@ -59,8 +59,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="value" type="double" lazy="false" column="`value`" 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="value" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="Mixed" abstract="false" lazy="false" discriminator-value="Mixed" table="`mixed`"> <meta attribute="eclassName">Mixed</meta> @@ -88,8 +92,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="value" type="double" lazy="false" column="`value`" 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="value" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> @@ -105,8 +113,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="firstName" type="java.lang.String" lazy="false" column="`firstname`" not-null="true"/> - <property name="middleName" type="java.lang.String" lazy="false" column="`middlename`" not-null="true"/> - <property name="lastName" type="java.lang.String" lazy="false" column="`lastname`" not-null="true"/> + <property name="firstName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`firstname`"/> + </property> + <property name="middleName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`middlename`"/> + </property> + <property name="lastName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`lastname`"/> + </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.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml index b13236691..2302da375 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.EcoreAttrsAction/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:36 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:55 CET 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" table="`element`"> <meta attribute="eclassName">Element</meta> @@ -57,8 +57,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="value" type="double" lazy="false" column="`value`" 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="value" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <class entity-name="Mixed" abstract="false" lazy="false" table="`mixed`"> <meta attribute="eclassName">Mixed</meta> @@ -85,8 +89,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="value" type="double" lazy="false" column="`value`" 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="value" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> @@ -101,8 +109,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="firstName" type="java.lang.String" lazy="false" column="`firstname`" not-null="true"/> - <property name="middleName" type="java.lang.String" lazy="false" column="`middlename`" not-null="true"/> - <property name="lastName" type="java.lang.String" lazy="false" column="`lastname`" not-null="true"/> + <property name="firstName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`firstname`"/> + </property> + <property name="middleName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`middlename`"/> + </property> + <property name="lastName" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`lastname`"/> + </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.ExtensionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml index 7294d930c..0a6cc3791 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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> + <typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</param> + <param name="edatatype">USStateObject</param> + </typedef> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta> @@ -14,9 +18,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="AddressList" abstract="false" lazy="false" discriminator-value="AddressList" table="`addresslist`"> <meta attribute="eclassName">AddressList</meta> @@ -29,7 +39,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> @@ -44,13 +56,19 @@ <subclass entity-name="UKAddress" abstract="false" lazy="false" extends="Address" discriminator-value="UKAddress"> <meta attribute="eclassName">UKAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta> - <property name="postcode" type="java.lang.String" lazy="false" column="`postcode`" not-null="false"/> - <property name="exportCode" type="java.math.BigInteger" lazy="false" column="`exportcode`" not-null="false"/> + <property name="postcode" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`postcode`"/> + </property> + <property name="exportCode" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`exportcode`"/> + </property> </subclass> <subclass entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" discriminator-value="DistrictUKAddress"> <meta attribute="eclassName">DistrictUKAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta> - <property name="district" type="java.lang.String" lazy="false" column="`district`" not-null="false"/> + <property name="district" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`district`"/> + </property> </subclass> <class entity-name="FirstAddressHolder" abstract="false" lazy="false" discriminator-value="FirstAddressHolder" table="`firstaddressholder`"> <meta attribute="eclassName">FirstAddressHolder</meta> @@ -82,17 +100,24 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="value" type="java.math.BigDecimal" lazy="false" column="`value`" not-null="false"/> - <property name="currency" type="java.lang.String" lazy="false" column="`currency`" not-null="false"/> + <property name="value" type="java.math.BigDecimal" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> + <property name="currency" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`currency`"/> + </property> </class> <subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"> <meta attribute="eclassName">USAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta> - <property name="state" lazy="false" not-null="false" column="`state`"> + <property name="state" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param> </type> </property> - <property name="zip" type="java.math.BigInteger" lazy="false" column="`zip`" not-null="false"/> + <property name="zip" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </subclass> </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.ExtensionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml index d9ffed696..5464d460f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ExtensionAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:38 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:58 CET 2006 --> <hibernate-mapping> + <typedef name="extension.USStateObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</param> + <param name="edatatype">USStateObject</param> + </typedef> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/store/test/emf/schemaconstructs/extension</meta> @@ -13,9 +17,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <property name="street" type="java.lang.String" lazy="false" column="`street`" not-null="true"/> - <property name="city" type="java.lang.String" lazy="false" column="`city`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> + <property name="street" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`street`"/> + </property> + <property name="city" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`city`"/> + </property> </class> <class entity-name="AddressList" abstract="false" lazy="false" table="`addresslist`"> <meta attribute="eclassName">AddressList</meta> @@ -27,7 +37,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <many-to-one name="firstAddress" entity-name="FirstAddressHolder" cascade="all" lazy="false" insert="true" update="true" not-null="true"> <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> @@ -45,8 +57,12 @@ <key> <column name="`address_id`"/> </key> - <property name="postcode" type="java.lang.String" lazy="false" column="`postcode`" not-null="true"/> - <property name="exportCode" type="java.math.BigInteger" lazy="false" column="`exportcode`" not-null="false"/> + <property name="postcode" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`postcode`"/> + </property> + <property name="exportCode" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`exportcode`"/> + </property> </joined-subclass> <joined-subclass entity-name="DistrictUKAddress" abstract="false" lazy="false" extends="UKAddress" table="`districtukaddress`"> <meta attribute="eclassName">DistrictUKAddress</meta> @@ -54,7 +70,9 @@ <key> <column name="`ukaddress_id`"/> </key> - <property name="district" type="java.lang.String" lazy="false" column="`district`" not-null="false"/> + <property name="district" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`district`"/> + </property> </joined-subclass> <class entity-name="FirstAddressHolder" abstract="false" lazy="false" table="`firstaddressholder`"> <meta attribute="eclassName">FirstAddressHolder</meta> @@ -84,8 +102,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="value" type="java.math.BigDecimal" lazy="false" column="`value`" not-null="false"/> - <property name="currency" type="java.lang.String" lazy="false" column="`currency`" not-null="false"/> + <property name="value" type="java.math.BigDecimal" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> + <property name="currency" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`currency`"/> + </property> </class> <joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -93,11 +115,14 @@ <key> <column name="`address_id`"/> </key> - <property name="state" lazy="false" not-null="false" column="`state`"> + <property name="state" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.extension.USState</param> </type> </property> - <property name="zip" type="java.math.BigInteger" lazy="false" column="`zip`" not-null="false"/> + <property name="zip" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`zip`"/> + </property> </joined-subclass> </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_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 diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml index 7dd05d682..dee23275d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,20 @@ <?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:45 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:07 CET 2006 --> <hibernate-mapping> + <typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">SixStatesList</param> + </typedef> + <typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">StateList</param> + </typedef> + <typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">StringList</param> + </typedef> <class entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`"> <meta attribute="eclassName">statesByCountry</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</meta> @@ -14,21 +26,17 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="country" type="java.lang.String" lazy="false" column="`country`" not-null="true"/> - <property name="index" type="int" lazy="false" column="`index`" not-null="false"/> - <list name="allStates" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`statesbycountry_allstates_id`" not-null="true" unique="false"/> - </key> - <list-index column="`statesbycountry_allstates_idx`"/> - <element type="java.lang.String"/> - </list> - <list name="sixImportantStates" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> - </key> - <list-index column="`statesbycountry_siximportantstates_idx`"/> - <element type="java.lang.String"/> - </list> + <property name="country" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`country`"/> + </property> + <property name="index" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`index`"/> + </property> + <property name="allStates" type="list.StateList" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`allstates`"/> + </property> + <property name="sixImportantStates" type="list.SixStatesList" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`siximportantstates`"/> + </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.ListAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml index 4f7c303e7..d413f10e4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.ListAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,20 @@ <?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:35 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:55 CET 2006 --> <hibernate-mapping> + <typedef name="list.SixStatesList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">SixStatesList</param> + </typedef> + <typedef name="list.StateList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">StateList</param> + </typedef> + <typedef name="list.StringList" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</param> + <param name="edatatype">StringList</param> + </typedef> <class entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`"> <meta attribute="eclassName">statesByCountry</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/list</meta> @@ -13,21 +25,17 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="country" type="java.lang.String" lazy="false" column="`country`" not-null="true"/> - <property name="index" type="int" lazy="false" column="`index`" not-null="false"/> - <list name="allStates" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`statesbycountry_allstates_id`" not-null="true" unique="false"/> - </key> - <list-index column="`statesbycountry_allstates_idx`"/> - <element type="java.lang.String"/> - </list> - <list name="sixImportantStates" lazy="true" cascade="all,delete-orphan"> - <key update="true"> - <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> - </key> - <list-index column="`statesbycountry_siximportantstates_idx`"/> - <element type="java.lang.String"/> - </list> + <property name="country" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`country`"/> + </property> + <property name="index" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`index`"/> + </property> + <property name="allStates" type="list.StateList" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`allstates`"/> + </property> + <property name="sixImportantStates" type="list.SixStatesList" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`siximportantstates`"/> + </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.MixedAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml index 86460a7cf..c7273e01b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/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:46 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:08 CET 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`"> <meta attribute="eclassName">LetterBodyType</meta> @@ -32,9 +32,15 @@ <many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`salutationtype_salutation_id`"/> </many-to-one> - <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="false"/> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> - <property name="shipDate" type="serializable" lazy="false" column="`shipdate`" not-null="false"/> + <property name="quantity" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="productName" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="shipDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> @@ -65,7 +71,9 @@ </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="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml index 35fa78266..0fd58e391 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.MixedAction/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:36 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:56 CET 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`"> <meta attribute="eclassName">LetterBodyType</meta> @@ -31,9 +31,15 @@ <many-to-one name="salutation" entity-name="SalutationType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`salutationtype_salutation_id`"/> </many-to-one> - <property name="quantity" type="java.math.BigInteger" lazy="false" column="`quantity`" not-null="false"/> - <property name="productName" type="java.lang.String" lazy="false" column="`productname`" not-null="false"/> - <property name="shipDate" type="serializable" lazy="false" column="`shipdate`" not-null="false"/> + <property name="quantity" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`quantity`"/> + </property> + <property name="productName" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`productname`"/> + </property> + <property name="shipDate" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shipdate`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> @@ -63,7 +69,9 @@ </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="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> <property name="fme_mixed_comment" type="java.lang.String"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml index 6c7e21175..1b23a700c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/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:50 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:12 CET 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <meta attribute="eclassName">A</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`a_group_id`" not-null="false" unique="false"/> @@ -30,7 +32,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> + <property name="b" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`b`"/> + </property> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> @@ -46,8 +50,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="cname" type="java.lang.String" lazy="false" column="`cname`" not-null="true"/> - <property name="cvalue" type="double" lazy="false" column="`cvalue`" not-null="false"/> + <property name="cname" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`cname`"/> + </property> + <property name="cvalue" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`cvalue`"/> + </property> </class> <class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`"> <meta attribute="eclassName">Element</meta> @@ -75,7 +83,9 @@ </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="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`element_true_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml index 58f58a093..eada04226 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.NestedGroupAction/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:40 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:00 CET 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <meta attribute="eclassName">A</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`a_group_id`" not-null="false" unique="false"/> @@ -29,7 +31,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> + <property name="b" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`b`"/> + </property> <many-to-one name="c" entity-name="CType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> @@ -44,8 +48,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="cname" type="java.lang.String" lazy="false" column="`cname`" not-null="true"/> - <property name="cvalue" type="double" lazy="false" column="`cvalue`" not-null="false"/> + <property name="cname" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`cname`"/> + </property> + <property name="cvalue" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`cvalue`"/> + </property> </class> <class entity-name="Element" abstract="false" lazy="false" table="`element`"> <meta attribute="eclassName">Element</meta> @@ -72,7 +80,9 @@ </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="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`element_true_id`" not-null="false" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml index ba6295c05..be192a9d1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/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:47 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:09 CET 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`"> <meta attribute="eclassName">XMLDeviant</meta> @@ -14,11 +14,21 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="numPosts" type="java.math.BigInteger" lazy="false" column="`numposts`" not-null="false"/> - <property name="signature" type="java.lang.String" lazy="false" column="`signature`" not-null="false"/> - <property name="email" type="java.lang.String" lazy="false" column="`email`" not-null="false"/> - <property name="firstSubscribed" type="serializable" lazy="false" column="`firstsubscribed`" not-null="false"/> - <property name="mailReader" type="java.lang.String" lazy="false" column="`mailreader`" not-null="false"/> + <property name="numPosts" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`numposts`"/> + </property> + <property name="signature" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`signature`"/> + </property> + <property name="email" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`email`"/> + </property> + <property name="firstSubscribed" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`firstsubscribed`"/> + </property> + <property name="mailReader" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mailreader`"/> + </property> </class> <subclass entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" discriminator-value="Member"> <meta attribute="eclassName">Member</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml index e74710380..d60d63be8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.RestrictionAction/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:38 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:57 CET 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`"> <meta attribute="eclassName">XMLDeviant</meta> @@ -13,11 +13,21 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="numPosts" type="java.math.BigInteger" lazy="false" column="`numposts`" not-null="false"/> - <property name="signature" type="java.lang.String" lazy="false" column="`signature`" not-null="false"/> - <property name="email" type="java.lang.String" lazy="false" column="`email`" not-null="false"/> - <property name="firstSubscribed" type="serializable" lazy="false" column="`firstsubscribed`" not-null="false"/> - <property name="mailReader" type="java.lang.String" lazy="false" column="`mailreader`" not-null="false"/> + <property name="numPosts" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`numposts`"/> + </property> + <property name="signature" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`signature`"/> + </property> + <property name="email" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`email`"/> + </property> + <property name="firstSubscribed" type="serializable" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`firstsubscribed`"/> + </property> + <property name="mailReader" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mailreader`"/> + </property> </class> <joined-subclass entity-name="Member" abstract="false" lazy="false" extends="XMLDeviant" table="`member`"> <meta attribute="eclassName">Member</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml index 8cd8f2e25..52ddc0ed9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_a_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:44 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:05 CET 2006 --> <hibernate-mapping> + <typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param> + <param name="edatatype">SimpleEnumObject</param> + </typedef> <class entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`"> <meta attribute="eclassName">SimpleList</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta> @@ -14,95 +18,123 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> - <element type="boolean"/> + <element type="boolean"> + <column not-null="false" unique="false" name="`boo`"/> + </element> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> - <element type="java.lang.Byte"/> + <element type="java.lang.Byte"> + <column not-null="false" unique="false" name="`byt`"/> + </element> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> - <element type="java.lang.Double"/> + <element type="java.lang.Double"> + <column not-null="false" unique="false" name="`doubl`"/> + </element> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> - <element type="java.lang.Float"/> + <element type="java.lang.Float"> + <column not-null="false" unique="false" name="`floa`"/> + </element> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> - <element type="java.lang.Integer"/> + <element type="java.lang.Integer"> + <column not-null="false" unique="false" name="`inte`"/> + </element> </list> <list name="long" table="longNum" lazy="true" cascade="all,delete-orphan"> <key/> <list-index column="`simplelist_long_idx`"/> - <element type="java.lang.Long"/> + <element type="java.lang.Long"> + <column not-null="false" unique="false" name="`long`"/> + </element> </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> - <element type="short"/> + <element type="short"> + <column not-null="false" unique="false" name="`shor`"/> + </element> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> - <element type="java.util.Date"/> + <element type="java.util.Date"> + <column not-null="false" unique="false" name="`dat`"/> + </element> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`limitedstring`"/> + </element> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> - <element type="int"/> + <element type="int"> + <column not-null="false" unique="false" name="`intarray`"/> + </element> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> - <element type="double"/> + <element type="double"> + <column not-null="false" unique="false" name="`doublearray`"/> + </element> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`stringarray`"/> + </element> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> - <element type="byte"/> + <element type="byte"> + <column not-null="false" unique="false" name="`bytearray`"/> + </element> </array> </class> <class entity-name="SimpleType" abstract="false" lazy="false" discriminator-value="SimpleType" table="`simpletype`"> @@ -116,21 +148,42 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> - <property name="boo" type="boolean" lazy="false" column="`boo`" not-null="false"/> - <property name="byt" type="byte" lazy="false" column="`byt`" not-null="false"/> - <property name="doubl" type="double" lazy="false" column="`doubl`" not-null="false"/> - <property name="float" type="float" lazy="false" column="`float`" not-null="false"/> - <property name="inte" type="int" lazy="false" column="`inte`" not-null="false"/> - <property name="lon" type="long" lazy="false" column="`lon`" not-null="false"/> - <property name="shor" type="short" lazy="false" column="`shor`" not-null="false"/> - <property name="enu" lazy="false" not-null="false" column="`enu`"> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="boo" type="boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`boo`"/> + </property> + <property name="byt" type="byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`byt`"/> + </property> + <property name="doubl" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`doubl`"/> + </property> + <property name="float" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`float`"/> + </property> + <property name="inte" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`inte`"/> + </property> + <property name="lon" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`lon`"/> + </property> + <property name="shor" type="short" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shor`"/> + </property> + <property name="enu" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`enu`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param> </type> </property> - <property name="dat" type="date" lazy="false" column="`dat`" not-null="true"/> - <property name="limitedstring" type="java.lang.String" lazy="false" column="`limitedstring`" not-null="true"/> + <property name="dat" type="timestamp" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`dat`"/> + </property> + <property name="limitedstring" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`limitedstring`"/> + </property> </class> <class entity-name="SimpleTypeObject" abstract="false" lazy="false" discriminator-value="SimpleTypeObject" table="`simpletypeobject`"> <meta attribute="eclassName">SimpleTypeObject</meta> @@ -143,19 +196,35 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> - <property name="boo" type="java.lang.Boolean" lazy="false" column="`boo`" not-null="false"/> - <property name="byt" type="java.lang.Byte" lazy="false" column="`byt`" not-null="false"/> - <property name="doubl" type="java.lang.Double" lazy="false" column="`doubl`" not-null="false"/> - <property name="float" type="java.lang.Float" lazy="false" column="`float`" not-null="false"/> - <property name="inte" type="java.lang.Integer" lazy="false" column="`inte`" not-null="false"/> - <property name="lon" type="java.lang.Long" lazy="false" column="`lon`" not-null="false"/> - <property name="shor" type="java.lang.Short" lazy="false" column="`shor`" not-null="false"/> - <property name="enu" lazy="false" not-null="false" column="`enu`"> - <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> - <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param> - </type> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="boo" type="java.lang.Boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`boo`"/> + </property> + <property name="byt" type="java.lang.Byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`byt`"/> + </property> + <property name="doubl" type="java.lang.Double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`doubl`"/> + </property> + <property name="float" type="java.lang.Float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`float`"/> + </property> + <property name="inte" type="java.lang.Integer" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`inte`"/> + </property> + <property name="lon" type="java.lang.Long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`lon`"/> + </property> + <property name="shor" type="java.lang.Short" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shor`"/> + </property> + <property name="enu" lazy="false" not-null="false" type="simpletypes.SimpleEnumObject"> + <column not-null="false" unique="false" name="`enu`"/> + </property> + <property name="dat" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`dat`"/> </property> - <property name="dat" type="date" lazy="false" column="`dat`" not-null="false"/> </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.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml index d203dae78..483fe1b3a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimpleTypeAction/mysql_s_o/hibernate.hbm.xml @@ -1,8 +1,12 @@ <?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:31 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:53 CET 2006 --> <hibernate-mapping> + <typedef name="simpletypes.SimpleEnumObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</param> + <param name="edatatype">SimpleEnumObject</param> + </typedef> <class entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`"> <meta attribute="eclassName">SimpleList</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/simpletypes</meta> @@ -13,95 +17,123 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> - <element type="boolean"/> + <element type="boolean"> + <column not-null="false" unique="false" name="`boo`"/> + </element> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> - <element type="java.lang.Byte"/> + <element type="java.lang.Byte"> + <column not-null="false" unique="false" name="`byt`"/> + </element> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> - <element type="java.lang.Double"/> + <element type="java.lang.Double"> + <column not-null="false" unique="false" name="`doubl`"/> + </element> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> - <element type="java.lang.Float"/> + <element type="java.lang.Float"> + <column not-null="false" unique="false" name="`floa`"/> + </element> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> - <element type="java.lang.Integer"/> + <element type="java.lang.Integer"> + <column not-null="false" unique="false" name="`inte`"/> + </element> </list> <list name="long" table="longNum" lazy="true" cascade="all,delete-orphan"> <key/> <list-index column="`simplelist_long_idx`"/> - <element type="java.lang.Long"/> + <element type="java.lang.Long"> + <column not-null="false" unique="false" name="`long`"/> + </element> </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> - <element type="short"/> + <element type="short"> + <column not-null="false" unique="false" name="`shor`"/> + </element> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> - <element type="java.util.Date"/> + <element type="java.util.Date"> + <column not-null="false" unique="false" name="`dat`"/> + </element> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`limitedstring`"/> + </element> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> - <element type="int"/> + <element type="int"> + <column not-null="false" unique="false" name="`intarray`"/> + </element> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> - <element type="double"/> + <element type="double"> + <column not-null="false" unique="false" name="`doublearray`"/> + </element> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> - <element type="java.lang.String"/> + <element type="java.lang.String"> + <column not-null="false" unique="false" name="`stringarray`"/> + </element> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> - <element type="byte"/> + <element type="byte"> + <column not-null="false" unique="false" name="`bytearray`"/> + </element> </array> </class> <class entity-name="SimpleType" abstract="false" lazy="false" table="`simpletype`"> @@ -114,21 +146,42 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> - <property name="boo" type="boolean" lazy="false" column="`boo`" not-null="false"/> - <property name="byt" type="byte" lazy="false" column="`byt`" not-null="false"/> - <property name="doubl" type="double" lazy="false" column="`doubl`" not-null="false"/> - <property name="float" type="float" lazy="false" column="`float`" not-null="false"/> - <property name="inte" type="int" lazy="false" column="`inte`" not-null="false"/> - <property name="lon" type="long" lazy="false" column="`lon`" not-null="false"/> - <property name="shor" type="short" lazy="false" column="`shor`" not-null="false"/> - <property name="enu" lazy="false" not-null="false" column="`enu`"> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="boo" type="boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`boo`"/> + </property> + <property name="byt" type="byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`byt`"/> + </property> + <property name="doubl" type="double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`doubl`"/> + </property> + <property name="float" type="float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`float`"/> + </property> + <property name="inte" type="int" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`inte`"/> + </property> + <property name="lon" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`lon`"/> + </property> + <property name="shor" type="short" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shor`"/> + </property> + <property name="enu" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`enu`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param> </type> </property> - <property name="dat" type="date" lazy="false" column="`dat`" not-null="true"/> - <property name="limitedstring" type="java.lang.String" lazy="false" column="`limitedstring`" not-null="true"/> + <property name="dat" type="timestamp" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`dat`"/> + </property> + <property name="limitedstring" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`limitedstring`"/> + </property> </class> <class entity-name="SimpleTypeObject" abstract="false" lazy="false" table="`simpletypeobject`"> <meta attribute="eclassName">SimpleTypeObject</meta> @@ -140,19 +193,35 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> - <property name="boo" type="java.lang.Boolean" lazy="false" column="`boo`" not-null="false"/> - <property name="byt" type="java.lang.Byte" lazy="false" column="`byt`" not-null="false"/> - <property name="doubl" type="java.lang.Double" lazy="false" column="`doubl`" not-null="false"/> - <property name="float" type="java.lang.Float" lazy="false" column="`float`" not-null="false"/> - <property name="inte" type="java.lang.Integer" lazy="false" column="`inte`" not-null="false"/> - <property name="lon" type="java.lang.Long" lazy="false" column="`lon`" not-null="false"/> - <property name="shor" type="java.lang.Short" lazy="false" column="`shor`" not-null="false"/> - <property name="enu" lazy="false" not-null="false" column="`enu`"> - <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> - <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.simpletypes.SimpleEnum</param> - </type> + <property name="code" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`code`"/> + </property> + <property name="boo" type="java.lang.Boolean" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`boo`"/> + </property> + <property name="byt" type="java.lang.Byte" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`byt`"/> + </property> + <property name="doubl" type="java.lang.Double" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`doubl`"/> + </property> + <property name="float" type="java.lang.Float" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`float`"/> + </property> + <property name="inte" type="java.lang.Integer" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`inte`"/> + </property> + <property name="lon" type="java.lang.Long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`lon`"/> + </property> + <property name="shor" type="java.lang.Short" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`shor`"/> + </property> + <property name="enu" lazy="false" not-null="false" type="simpletypes.SimpleEnumObject"> + <column not-null="false" unique="false" name="`enu`"/> + </property> + <property name="dat" type="timestamp" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`dat`"/> </property> - <property name="dat" type="date" lazy="false" column="`dat`" not-null="false"/> </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.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml index b04438f9e..5f3be23b5 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/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:47 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:08 CET 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`"> <meta attribute="eclassName">Supplier</meta> @@ -27,7 +29,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`supplier_orders_id`" not-null="false" unique="false"/> @@ -49,7 +53,11 @@ <many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/> </many-to-one> - <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" column="`hardcopyorderreference`" not-null="false"/> - <property name="hardCopyOrderNumber" type="long" lazy="false" column="`hardcopyordernumber`" not-null="false"/> + <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`hardcopyorderreference`"/> + </property> + <property name="hardCopyOrderNumber" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`hardcopyordernumber`"/> + </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.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml index b48711bd4..e5445d448 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SimplefeaturemapAction/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:37 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:28:57 CET 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`"> <meta attribute="eclassName">PurchaseOrder</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <class entity-name="Supplier" abstract="false" lazy="false" table="`supplier`"> <meta attribute="eclassName">Supplier</meta> @@ -25,7 +27,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`supplier_orders_id`" not-null="false" unique="false"/> @@ -47,7 +51,11 @@ <many-to-one name="standardOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> <column not-null="false" unique="false" name="`purchaseorder_standardorders_id`"/> </many-to-one> - <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" column="`hardcopyorderreference`" not-null="false"/> - <property name="hardCopyOrderNumber" type="long" lazy="false" column="`hardcopyordernumber`" not-null="false"/> + <property name="hardCopyOrderReference" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`hardcopyorderreference`"/> + </property> + <property name="hardCopyOrderNumber" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`hardcopyordernumber`"/> + </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.SubstitutionAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml index 0d8a82979..b98cc91a6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/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:51 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:14 CET 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`"> <meta attribute="eclassName">ComplexNumber</meta> @@ -14,8 +14,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="value" type="java.math.BigInteger" lazy="false" column="`value`" not-null="true"/> - <property name="unit" type="java.lang.String" lazy="false" column="`unit`" not-null="true"/> + <property name="value" type="java.math.BigInteger" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> + <property name="unit" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`unit`"/> + </property> </class> <subclass entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="EvenComplexNumberType"> <meta attribute="eclassName">EvenComplexNumberType</meta> @@ -32,7 +36,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> @@ -63,7 +69,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> @@ -86,7 +94,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" column="`mysimpleabstract`" not-null="false"/> + <property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mysimpleabstract`"/> + </property> </class> <class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`"> <meta attribute="featureMap">NumberType</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml index 3aa19af5e..c35e0579c 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionAction/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:42 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:02 CET 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`"> <meta attribute="eclassName">ComplexNumber</meta> @@ -13,8 +13,12 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="value" type="java.math.BigInteger" lazy="false" column="`value`" not-null="true"/> - <property name="unit" type="java.lang.String" lazy="false" column="`unit`" not-null="true"/> + <property name="value" type="java.math.BigInteger" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`value`"/> + </property> + <property name="unit" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`unit`"/> + </property> </class> <joined-subclass entity-name="EvenComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`evencomplexnumbertype`"> <meta attribute="eclassName">EvenComplexNumberType</meta> @@ -33,7 +37,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> @@ -63,7 +69,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> @@ -86,7 +94,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" column="`mysimpleabstract`" not-null="false"/> + <property name="mySimpleAbstract" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`mysimpleabstract`"/> + </property> </class> <class entity-name="NumberType_myComplexAbstractGroup" lazy="false" table="`numbertype_mycomplexabstractgroup`"> <meta attribute="featureMap">NumberType</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml index b12d8005c..19158baac 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/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:50 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:13 CET 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`"> <meta attribute="eclassName">ComplexAAA</meta> @@ -14,7 +14,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="value" type="long" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <subclass entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" discriminator-value="ComplexEvenType"> <meta attribute="eclassName">ComplexEvenType</meta> @@ -57,7 +59,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="myAbstract" type="java.math.BigInteger" lazy="false" column="`myabstract`" not-null="false"/> + <property name="myAbstract" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myabstract`"/> + </property> </class> <class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`"> <meta attribute="featureMap">RootType</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml index 091a806b2..d627858d9 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction/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:41 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:02 CET 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`"> <meta attribute="eclassName">ComplexAAA</meta> @@ -13,7 +13,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="value" type="long" lazy="false" column="`value`" not-null="false"/> + <property name="value" type="long" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`value`"/> + </property> </class> <joined-subclass entity-name="ComplexEvenType" abstract="false" lazy="false" extends="ComplexAAA" table="`complexeventype`"> <meta attribute="eclassName">ComplexEvenType</meta> @@ -61,7 +63,9 @@ </id> <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> - <property name="myAbstract" type="java.math.BigInteger" lazy="false" column="`myabstract`" not-null="false"/> + <property name="myAbstract" type="java.math.BigInteger" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`myabstract`"/> + </property> </class> <class entity-name="RootType_myComplexAbstractGroup" lazy="false" table="`roottype_mycomplexabstractgroup`"> <meta attribute="featureMap">RootType</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml index 7422781a2..7b1436e29 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/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:58:00 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:24 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`address_country_id`" not-null="false" unique="false"/> @@ -34,7 +36,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`city_address_id`" not-null="false" unique="false"/> @@ -54,7 +58,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_address_id`" not-null="false" unique="false"/> @@ -66,16 +72,22 @@ <subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"> <meta attribute="eclassName">USAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="false"/> + <property name="state" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> + </property> </subclass> <subclass entity-name="USCity" abstract="false" lazy="false" extends="City" discriminator-value="USCity"> <meta attribute="eclassName">USCity</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="false"/> + <property name="state" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> + </property> </subclass> <subclass entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" discriminator-value="USOfficeAddress"> <meta attribute="eclassName">USOfficeAddress</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/abstractreference</meta> - <property name="location" type="java.lang.String" lazy="false" column="`location`" not-null="false"/> + <property name="location" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`location`"/> + </property> </subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml index 0fc59c37a..20a5c1ee1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.AbstractReferenceAction/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:54 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:17 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`address_country_id`" not-null="false" unique="false"/> @@ -32,7 +34,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`city_address_id`" not-null="false" unique="false"/> @@ -51,7 +55,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> <column name="`person_address_id`" not-null="false" unique="false"/> @@ -66,7 +72,9 @@ <key> <column name="`address_id`"/> </key> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="true"/> + <property name="state" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`state`"/> + </property> </joined-subclass> <joined-subclass entity-name="USCity" abstract="false" lazy="false" extends="City" table="`uscity`"> <meta attribute="eclassName">USCity</meta> @@ -74,7 +82,9 @@ <key> <column name="`city_id`"/> </key> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="true"/> + <property name="state" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`state`"/> + </property> </joined-subclass> <joined-subclass entity-name="USOfficeAddress" abstract="false" lazy="false" extends="USAddress" table="`usofficeaddress`"> <meta attribute="eclassName">USOfficeAddress</meta> @@ -82,6 +92,8 @@ <key> <column name="`usaddress_id`"/> </key> - <property name="location" type="java.lang.String" lazy="false" column="`location`" not-null="true"/> + <property name="location" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`location`"/> + </property> </joined-subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml index a50b2d748..638ba367a 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:59 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:23 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bagduplicate</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml index 668ba3528..66358a938 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.BagDuplicateAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:53 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:17 CET 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/bagduplicate</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml index 2758f2c75..e58210fda 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,17 @@ <?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:58:00 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:23 CET 2006 --> <hibernate-mapping> + <typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param> + <param name="edatatype">ItemTypeObject</param> + </typedef> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</meta> - <id name="itemType" column="`itemtype`"> + <id name="itemType"> + <column not-null="false" unique="false" name="`itemtype`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param> </type> @@ -15,7 +20,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="nullableItemType" lazy="false" not-null="false" column="`nullableitemtype`"> + <property name="nullableItemType" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`nullableitemtype`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param> </type> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml index 3ed6ee2ea..650fac192 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.EnumTestAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,17 @@ <?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:54 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:17 CET 2006 --> <hibernate-mapping> + <typedef name="enumtest.ItemTypeObject" class="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType"> + <param name="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</param> + <param name="edatatype">ItemTypeObject</param> + </typedef> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/enumtest</meta> - <id name="itemType" column="`itemtype`"> + <id name="itemType"> + <column not-null="false" unique="false" name="`itemtype`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param> </type> @@ -14,7 +19,8 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="nullableItemType" lazy="false" not-null="false" column="`nullableitemtype`"> + <property name="nullableItemType" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`nullableitemtype`"/> <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType"> <param name="enumClass">org.eclipse.emf.teneo.samples.issues.enumtest.ItemType</param> </type> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml index 6683d543d..b1c30cf1d 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:59 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:22 CET 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`"> <meta attribute="eclassName">Thing</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -34,7 +36,9 @@ <class entity-name="SubThing" abstract="false" lazy="false" discriminator-value="SubThing" table="`subthing`"> <meta attribute="eclassName">SubThing</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml index eee142653..a3671a727 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InheritanceAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:52 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:16 CET 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" table="`thing`"> <meta attribute="eclassName">Thing</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -42,7 +44,9 @@ <class entity-name="SubThing" abstract="false" lazy="false" table="`subthing`"> <meta attribute="eclassName">SubThing</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/inheritance</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml index 0708043be..b02736fa6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/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:58:00 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:25 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -14,11 +14,15 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" discriminator-value="USAddress"> <meta attribute="eclassName">USAddress</meta> <meta attribute="epackage">http:///org/elver/store/test/issues/interfacetrue.ecore</meta> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="false"/> + <property name="state" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`state`"/> + </property> </subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml index 2f68af1ab..4ae238686 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.InterfaceTrueAction/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:55 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:19 CET 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <meta attribute="eclassName">Address</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <joined-subclass entity-name="USAddress" abstract="false" lazy="false" extends="Address" table="`usaddress`"> <meta attribute="eclassName">USAddress</meta> @@ -21,6 +23,8 @@ <key> <column name="`address_id`"/> </key> - <property name="state" type="java.lang.String" lazy="false" column="`state`" not-null="true"/> + <property name="state" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`state`"/> + </property> </joined-subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml index 83b457c3c..9d8fbc1e6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/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:57 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:21 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="item_item"> <key update="true"> <column name="`item_myside_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml index e4cc1d84a..87de5c132 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.MTMSameAction/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:52 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:15 CET 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <meta attribute="eclassName">Item</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <bag name="mySide" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="item_item"> <key update="true"> <column name="`item_myside_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml index 2a5a85195..1dd76e435 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_a_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:59 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:22 CET 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta> - <id name="hair" type="java.lang.String" column="`hair`"/> + <id name="hair" type="java.lang.String"> + <column not-null="false" unique="false" name="`hair`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> @@ -15,7 +17,9 @@ <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml index 86eb80f93..c75509e7e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.ResourceAction/mysql_s_o/hibernate.hbm.xml @@ -1,12 +1,14 @@ <?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:53 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:16 CET 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <meta attribute="eclassName">Head</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta> - <id name="hair" type="java.lang.String" column="`hair`"/> + <id name="hair" type="java.lang.String"> + <column not-null="false" unique="false" name="`hair`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> @@ -14,7 +16,9 @@ <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <meta attribute="eclassName">Person</meta> <meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/issues/resource</meta> - <id name="name" type="java.lang.String" column="`name`"/> + <id name="name" type="java.lang.String"> + <column not-null="false" unique="false" name="`name`"/> + </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml index 9cfa607a2..96293faf8 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/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:58:00 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:25 CET 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`"> <meta attribute="eclassName">Me</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="me_you"> <key update="true"> <column name="`me_id`" not-null="true" unique="false"/> @@ -36,7 +38,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="you_me"> <key update="true"> <column name="`you_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml index 430a7a9aa..6f2f5f80e 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.SimplenmAction/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:55 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:19 CET 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" table="`me`"> <meta attribute="eclassName">Me</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="you" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="me_you"> <key update="true"> <column name="`me_id`" not-null="true" unique="false"/> @@ -34,7 +36,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> + <property name="name" type="java.lang.String" lazy="false" not-null="true"> + <column not-null="false" unique="false" name="`name`"/> + </property> <list name="me" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="you_me"> <key update="true"> <column name="`you_id`" not-null="true" unique="false"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml index aee2d7e69..989c5de01 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_a_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/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:58:01 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:26 CET 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`"> <meta attribute="eclassName">AbstractSuper</meta> @@ -14,7 +14,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <subclass entity-name="M" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="M"> <meta attribute="eclassName">M</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml index 1cc5eca9d..1b13fddb1 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/mysql_s_o/hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.issues.TopClassesAction/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:56 CET 2006 --> +<!-- Generated by Teneo on Mon Nov 13 15:29:20 CET 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`"> <meta attribute="eclassName">AbstractSuper</meta> @@ -13,7 +13,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="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + <property name="name" type="java.lang.String" lazy="false" not-null="false"> + <column not-null="false" unique="false" name="`name`"/> + </property> </class> <joined-subclass entity-name="M" abstract="false" lazy="false" extends="AbstractSuper" table="`m`"> <meta attribute="eclassName">M</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java index 78196d3e2..21f184337 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/AllTests.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AllTests.java,v 1.17 2006/11/12 00:07:56 mtaal Exp $ + * $Id: AllTests.java,v 1.18 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.emf.annotations; @@ -46,20 +46,20 @@ import org.eclipse.emf.teneo.test.emf.annotations.SetResourceAction; import org.eclipse.emf.teneo.test.emf.annotations.ToOneAction; import org.eclipse.emf.teneo.test.emf.annotations.TransientAction; import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction; -import org.eclipse.emf.teneo.test.issues.MTMSameAction; /** * All tests * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.17 $ + * @version $Revision: 1.18 $ */ public class AllTests { public static Test suite() { TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.annotations", HibernateTestbed.instance().getConfigurations()); - + + suite.addTestSuite(UserTypeAction.class); suite.addTestSuite(MappedSuperClassAction.class); suite.addTestSuite(ToOneAction.class); @@ -77,8 +77,6 @@ public class AllTests { suite.addTestSuite(LazyLibraryAction.class); - suite.addTestSuite(UserTypeAction.class); - suite.addTestSuite(BookAction.class); suite.addTestSuite(EDataTypeAction.class); @@ -103,7 +101,6 @@ public class AllTests { suite.addTestSuite(LobAction.class); suite.addTestSuite(EmbeddedIdAction.class); return suite; - } } diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/UserTypeAction.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/UserTypeAction.java index 3b422fe0d..bfa3a57b2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/UserTypeAction.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/annotations/UserTypeAction.java @@ -11,7 +11,7 @@ * L.M. Fridael
* </copyright>
*
- * $Id: UserTypeAction.java,v 1.3 2006/07/23 23:50:14 mtaal Exp $
+ * $Id: UserTypeAction.java,v 1.4 2006/11/13 14:52:45 mtaal Exp $
*/
package org.eclipse.emf.teneo.hibernate.test.emf.annotations;
@@ -24,6 +24,7 @@ import java.util.List; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name;
import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person;
+import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber;
import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypeFactory;
import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage;
import org.eclipse.emf.teneo.test.AbstractTestAction;
@@ -33,7 +34,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * Test
*
* @author <a href="mailto:lmfridael@elver.org">Laurens Fridael</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class UserTypeAction extends AbstractTestAction {
@@ -55,6 +56,13 @@ public class UserTypeAction extends AbstractTestAction { store.beginTransaction();
Person person = UsertypeFactory.eINSTANCE.createPerson();
person.setName(NAME);
+ UsaPhoneNumber up1 = new UsaPhoneNumber(100, 200, 300);
+ UsaPhoneNumber up2 = new UsaPhoneNumber(400, 500, 600);
+ UsaPhoneNumber up3 = new UsaPhoneNumber(700, 800, 900);
+ person.setEmergencyContact(up1);
+ person.getPhoneNumbers().add(up2);
+ person.getPhoneNumbers().add(up3);
+ person.setNumbers(new int[] {4, 5});
store.store(person);
store.commitTransaction();
}
@@ -65,6 +73,13 @@ public class UserTypeAction extends AbstractTestAction { assertEquals(1, results.size());
Person person = (Person) results.get(0);
assertEquals(NAME, person.getName());
+ assertEquals(new UsaPhoneNumber(100, 200, 300), person.getEmergencyContact());
+ assertTrue(person.getPhoneNumbers().contains(new UsaPhoneNumber(400, 500, 600)));
+ assertTrue(person.getPhoneNumbers().contains(new UsaPhoneNumber(700, 800, 900)));
+ int[] nums = person.getNumbers();
+ assertEquals(2, nums.length);
+ assertEquals(4, nums[0]);
+ assertEquals(5, nums[1]);
store.commitTransaction();
}
@@ -95,5 +110,4 @@ public class UserTypeAction extends AbstractTestAction { }
}
}
-
-}
+}
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/Person.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/Person.java index 7b5ed8af3..cfcc37258 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/Person.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/Person.java @@ -2,10 +2,12 @@ * <copyright> * </copyright> * - * $Id: Person.java,v 1.3 2006/09/07 08:10:02 mtaal Exp $ + * $Id: Person.java,v 1.4 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.hibernate.usertype; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EObject; /** @@ -17,6 +19,9 @@ import org.eclipse.emf.ecore.EObject; * The following features are supported: * <ul> * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getNumbers <em>Numbers</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getPhoneNumbers <em>Phone Numbers</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getEmergencyContact <em>Emergency Contact</em>}</li> * </ul> * </p> * @@ -52,4 +57,74 @@ public interface Person extends EObject { */ void setName(Name value); + /** + * Returns the value of the '<em><b>Numbers</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Numbers</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Numbers</em>' attribute. + * @see #setNumbers(int[]) + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage#getPerson_Numbers() + * @model unique="false" dataType="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.IntArray" required="true" + * extendedMetaData="kind='element' name='intArray'" + * @generated + */ + int[] getNumbers(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getNumbers <em>Numbers</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Numbers</em>' attribute. + * @see #getNumbers() + * @generated + */ + void setNumbers(int[] value); + + /** + * Returns the value of the '<em><b>Phone Numbers</b></em>' attribute list. + * The list contents are of type {@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber}. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Phone Numbers</em>' attribute list isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Phone Numbers</em>' attribute list. + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage#getPerson_PhoneNumbers() + * @model type="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber" dataType="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.PhoneNumber" upper="100" + * @generated + */ + EList getPhoneNumbers(); + + /** + * Returns the value of the '<em><b>Emergency Contact</b></em>' attribute. + * The default value is <code>""</code>. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Emergency Contact</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Emergency Contact</em>' attribute. + * @see #setEmergencyContact(UsaPhoneNumber) + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage#getPerson_EmergencyContact() + * @model default="" dataType="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.PhoneNumber" + * @generated + */ + UsaPhoneNumber getEmergencyContact(); + + /** + * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getEmergencyContact <em>Emergency Contact</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Emergency Contact</em>' attribute. + * @see #getEmergencyContact() + * @generated + */ + void setEmergencyContact(UsaPhoneNumber value); + } // Person
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsaPhoneNumber.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsaPhoneNumber.java new file mode 100644 index 000000000..c453e3339 --- /dev/null +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsaPhoneNumber.java @@ -0,0 +1,50 @@ +package org.eclipse.emf.teneo.samples.emf.hibernate.usertype;
+
+
+/**
+ * Trivial example implementation of a specific type.
+ */
+public class UsaPhoneNumber {
+
+ private int num1;
+ private int num2;
+ private int num3;
+
+ public UsaPhoneNumber(int num1, int num2, int num3) {
+ this.num1 = num1;
+ this.num2 = num2;
+ this.num3 = num3;
+ }
+
+ public UsaPhoneNumber(String numbers) {
+ String[] nums = numbers.split("_");
+ num1 = Integer.parseInt(nums[0]);
+ num2 = Integer.parseInt(nums[1]);
+ num3 = Integer.parseInt(nums[2]);
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ public boolean equals(Object obj) {
+ if (!(obj instanceof UsaPhoneNumber)) {
+ return false;
+ }
+ UsaPhoneNumber up = (UsaPhoneNumber)obj;
+ return up.num1 == num1 && up.num2 == num2 && up.num3 == num3;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ public int hashCode() {
+ return num1 + num2 + num3;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ return num1 + "_" + num2 + "_" + num3;
+ }
+}
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsertypePackage.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsertypePackage.java index 7ad7f95e6..9ae77c6af 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsertypePackage.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/UsertypePackage.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UsertypePackage.java,v 1.6 2006/09/07 22:26:49 mtaal Exp $ + * $Id: UsertypePackage.java,v 1.7 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.hibernate.usertype; @@ -79,13 +79,40 @@ public interface UsertypePackage extends EPackage { int PERSON__NAME = 0; /** + * The feature id for the '<em><b>Numbers</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PERSON__NUMBERS = 1; + + /** + * The feature id for the '<em><b>Phone Numbers</b></em>' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PERSON__PHONE_NUMBERS = 2; + + /** + * The feature id for the '<em><b>Emergency Contact</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int PERSON__EMERGENCY_CONTACT = 3; + + /** * The number of structural features of the '<em>Person</em>' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated * @ordered */ - int PERSON_FEATURE_COUNT = 1; + int PERSON_FEATURE_COUNT = 4; /** * The meta object id for the '<em>Name</em>' data type. @@ -99,6 +126,27 @@ public interface UsertypePackage extends EPackage { /** + * The meta object id for the '<em>Phone Number</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.UsertypePackageImpl#getPhoneNumber() + * @generated + */ + int PHONE_NUMBER = 2; + + + /** + * The meta object id for the '<em>Int Array</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.UsertypePackageImpl#getIntArray() + * @generated + */ + int INT_ARRAY = 3; + + + /** * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person <em>Person</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -120,19 +168,75 @@ public interface UsertypePackage extends EPackage { EAttribute getPerson_Name(); /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getNumbers <em>Numbers</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Numbers</em>'. + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getNumbers() + * @see #getPerson() + * @generated + */ + EAttribute getPerson_Numbers(); + + /** + * Returns the meta object for the attribute list '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getPhoneNumbers <em>Phone Numbers</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute list '<em>Phone Numbers</em>'. + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getPhoneNumbers() + * @see #getPerson() + * @generated + */ + EAttribute getPerson_PhoneNumbers(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getEmergencyContact <em>Emergency Contact</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Emergency Contact</em>'. + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person#getEmergencyContact() + * @see #getPerson() + * @generated + */ + EAttribute getPerson_EmergencyContact(); + + /** * Returns the meta object for data type '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for data type '<em>Name</em>'. * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name * @model instanceClass="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name" - * annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@Type(type=\"org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType\")\n\t\t\t\t\t\t@Columns({@Column(name=\"first_name\"), @Column(name=\"last_name\")})\n\t\t\t\t\t'" + * annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@TypeDef(name=\"nameType\" typeClass=\"org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType\")\n\t\t\t\t\t\t@Columns({@Column(name=\"first_name\"), @Column(name=\"last_name\")})\n\t\t\t\t\t'" * extendedMetaData="name='Name'" * @generated */ EDataType getName_(); /** + * Returns the meta object for data type '{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber <em>Phone Number</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for data type '<em>Phone Number</em>'. + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber + * @model instanceClass="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber" + * @generated + */ + EDataType getPhoneNumber(); + + /** + * Returns the meta object for data type '<em>Int Array</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for data type '<em>Int Array</em>'. + * @model instanceClass="int[]" + * extendedMetaData="name='IntArray'" + * annotation="teneo.jpa appinfo='\n\t\t\t\t\t\t@TypeDef(name=\"intArrayType\" typeClass=\"org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType\", parameters={@Parameter(name=\"epackage\" value=\"http://www.elver.org/samples/emf/hibernate/usertype\"), @Parameter(name=\"edatatype\", value=\"IntArray\")})\n\t\t\t\t\t'" + * @generated + */ + EDataType getIntArray(); + + /** * Returns the factory that creates the instances of the model. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -173,6 +277,30 @@ public interface UsertypePackage extends EPackage { EAttribute PERSON__NAME = eINSTANCE.getPerson_Name(); /** + * The meta object literal for the '<em><b>Numbers</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PERSON__NUMBERS = eINSTANCE.getPerson_Numbers(); + + /** + * The meta object literal for the '<em><b>Phone Numbers</b></em>' attribute list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PERSON__PHONE_NUMBERS = eINSTANCE.getPerson_PhoneNumbers(); + + /** + * The meta object literal for the '<em><b>Emergency Contact</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute PERSON__EMERGENCY_CONTACT = eINSTANCE.getPerson_EmergencyContact(); + + /** * The meta object literal for the '<em>Name</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -182,6 +310,25 @@ public interface UsertypePackage extends EPackage { */ EDataType NAME = eINSTANCE.getName_(); + /** + * The meta object literal for the '<em>Phone Number</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.UsertypePackageImpl#getPhoneNumber() + * @generated + */ + EDataType PHONE_NUMBER = eINSTANCE.getPhoneNumber(); + + /** + * The meta object literal for the '<em>Int Array</em>' data type. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.UsertypePackageImpl#getIntArray() + * @generated + */ + EDataType INT_ARRAY = eINSTANCE.getIntArray(); + } } //UsertypePackage diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/PersonImpl.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/PersonImpl.java index 2a74d92ae..09c2cced6 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/PersonImpl.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/PersonImpl.java @@ -2,19 +2,27 @@ * <copyright> * </copyright> * - * $Id: PersonImpl.java,v 1.6 2006/09/07 22:26:49 mtaal Exp $ + * $Id: PersonImpl.java,v 1.7 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl; +import java.util.Collection; + import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.EList; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; +import org.eclipse.emf.ecore.util.EDataTypeUniqueEList; + import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person; +import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber; +import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypeFactory; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage; /** @@ -25,6 +33,9 @@ import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage; * The following features are implemented: * <ul> * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl#getNumbers <em>Numbers</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl#getPhoneNumbers <em>Phone Numbers</em>}</li> + * <li>{@link org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl.PersonImpl#getEmergencyContact <em>Emergency Contact</em>}</li> * </ul> * </p> * @@ -52,6 +63,56 @@ public class PersonImpl extends EObjectImpl implements Person { protected Name name = NAME_EDEFAULT; /** + * The default value of the '{@link #getNumbers() <em>Numbers</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNumbers() + * @generated + * @ordered + */ + protected static final int[] NUMBERS_EDEFAULT = null; + + /** + * The cached value of the '{@link #getNumbers() <em>Numbers</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getNumbers() + * @generated + * @ordered + */ + protected int[] numbers = NUMBERS_EDEFAULT; + + /** + * The cached value of the '{@link #getPhoneNumbers() <em>Phone Numbers</em>}' attribute list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getPhoneNumbers() + * @generated + * @ordered + */ + protected EList phoneNumbers = null; + + /** + * The default value of the '{@link #getEmergencyContact() <em>Emergency Contact</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getEmergencyContact() + * @generatedNOT + * @ordered + */ + protected static final UsaPhoneNumber EMERGENCY_CONTACT_EDEFAULT = (UsaPhoneNumber)UsertypeFactory.eINSTANCE.createFromString(UsertypePackage.eINSTANCE.getPhoneNumber(), "000_000_000"); + + /** + * The cached value of the '{@link #getEmergencyContact() <em>Emergency Contact</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getEmergencyContact() + * @generated + * @ordered + */ + protected UsaPhoneNumber emergencyContact = EMERGENCY_CONTACT_EDEFAULT; + + /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -95,10 +156,70 @@ public class PersonImpl extends EObjectImpl implements Person { * <!-- end-user-doc --> * @generated */ + public int[] getNumbers() { + return numbers; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setNumbers(int[] newNumbers) { + int[] oldNumbers = numbers; + numbers = newNumbers; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UsertypePackage.PERSON__NUMBERS, oldNumbers, numbers)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList getPhoneNumbers() { + if (phoneNumbers == null) { + phoneNumbers = new EDataTypeUniqueEList(UsaPhoneNumber.class, this, UsertypePackage.PERSON__PHONE_NUMBERS); + } + return phoneNumbers; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public UsaPhoneNumber getEmergencyContact() { + return emergencyContact; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setEmergencyContact(UsaPhoneNumber newEmergencyContact) { + UsaPhoneNumber oldEmergencyContact = emergencyContact; + emergencyContact = newEmergencyContact; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, UsertypePackage.PERSON__EMERGENCY_CONTACT, oldEmergencyContact, emergencyContact)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { case UsertypePackage.PERSON__NAME: return getName(); + case UsertypePackage.PERSON__NUMBERS: + return getNumbers(); + case UsertypePackage.PERSON__PHONE_NUMBERS: + return getPhoneNumbers(); + case UsertypePackage.PERSON__EMERGENCY_CONTACT: + return getEmergencyContact(); } return super.eGet(featureID, resolve, coreType); } @@ -113,6 +234,16 @@ public class PersonImpl extends EObjectImpl implements Person { case UsertypePackage.PERSON__NAME: setName((Name)newValue); return; + case UsertypePackage.PERSON__NUMBERS: + setNumbers((int[])newValue); + return; + case UsertypePackage.PERSON__PHONE_NUMBERS: + getPhoneNumbers().clear(); + getPhoneNumbers().addAll((Collection)newValue); + return; + case UsertypePackage.PERSON__EMERGENCY_CONTACT: + setEmergencyContact((UsaPhoneNumber)newValue); + return; } super.eSet(featureID, newValue); } @@ -127,6 +258,15 @@ public class PersonImpl extends EObjectImpl implements Person { case UsertypePackage.PERSON__NAME: setName(NAME_EDEFAULT); return; + case UsertypePackage.PERSON__NUMBERS: + setNumbers(NUMBERS_EDEFAULT); + return; + case UsertypePackage.PERSON__PHONE_NUMBERS: + getPhoneNumbers().clear(); + return; + case UsertypePackage.PERSON__EMERGENCY_CONTACT: + setEmergencyContact(EMERGENCY_CONTACT_EDEFAULT); + return; } super.eUnset(featureID); } @@ -140,6 +280,12 @@ public class PersonImpl extends EObjectImpl implements Person { switch (featureID) { case UsertypePackage.PERSON__NAME: return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); + case UsertypePackage.PERSON__NUMBERS: + return NUMBERS_EDEFAULT == null ? numbers != null : !NUMBERS_EDEFAULT.equals(numbers); + case UsertypePackage.PERSON__PHONE_NUMBERS: + return phoneNumbers != null && !phoneNumbers.isEmpty(); + case UsertypePackage.PERSON__EMERGENCY_CONTACT: + return EMERGENCY_CONTACT_EDEFAULT == null ? emergencyContact != null : !EMERGENCY_CONTACT_EDEFAULT.equals(emergencyContact); } return super.eIsSet(featureID); } @@ -155,6 +301,12 @@ public class PersonImpl extends EObjectImpl implements Person { StringBuffer result = new StringBuffer(super.toString()); result.append(" (name: "); result.append(name); + result.append(", numbers: "); + result.append(numbers); + result.append(", phoneNumbers: "); + result.append(phoneNumbers); + result.append(", emergencyContact: "); + result.append(emergencyContact); result.append(')'); return result.toString(); } diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypeFactoryImpl.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypeFactoryImpl.java index 1f8a4a750..1ad77c1ec 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypeFactoryImpl.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypeFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UsertypeFactoryImpl.java,v 1.4 2006/09/07 08:18:01 mtaal Exp $ + * $Id: UsertypeFactoryImpl.java,v 1.5 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl; @@ -75,6 +75,10 @@ public class UsertypeFactoryImpl extends EFactoryImpl implements UsertypeFactory switch (eDataType.getClassifierID()) { case UsertypePackage.NAME: return createNameFromString(eDataType, initialValue); + case UsertypePackage.PHONE_NUMBER: + return createPhoneNumberFromString(eDataType, initialValue); + case UsertypePackage.INT_ARRAY: + return createIntArrayFromString(eDataType, initialValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -89,6 +93,10 @@ public class UsertypeFactoryImpl extends EFactoryImpl implements UsertypeFactory switch (eDataType.getClassifierID()) { case UsertypePackage.NAME: return convertNameToString(eDataType, instanceValue); + case UsertypePackage.PHONE_NUMBER: + return convertPhoneNumberToString(eDataType, instanceValue); + case UsertypePackage.INT_ARRAY: + return convertIntArrayToString(eDataType, instanceValue); default: throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); } @@ -127,6 +135,54 @@ public class UsertypeFactoryImpl extends EFactoryImpl implements UsertypeFactory * <!-- end-user-doc --> * @generated */ + public UsaPhoneNumber createPhoneNumberFromString(EDataType eDataType, String initialValue) { + return (UsaPhoneNumber)super.createFromString(eDataType, initialValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String convertPhoneNumberToString(EDataType eDataType, Object instanceValue) { + return super.convertToString(eDataType, instanceValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generatedNOT + */ + public int[] createIntArrayFromString(EDataType eDataType, String initialValue) { + if (initialValue == null) return null; + final String[] vals = initialValue.split("_"); + final int[] result = new int[vals.length]; + for (int i = 0; i < vals.length; i++) { + result[i] = Integer.parseInt(vals[i]); + } + return result; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generatedNOT + */ + public String convertIntArrayToString(EDataType eDataType, Object instanceValue) { + final int[] vals = (int[])instanceValue; + final StringBuffer result = new StringBuffer(); + for (int i = 0; i < vals.length; i++) { + if (i > 0) result.append("_"); + result.append(vals[i] + ""); + } + return result.toString(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public UsertypePackage getUsertypePackage() { return (UsertypePackage)getEPackage(); } diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypePackageImpl.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypePackageImpl.java index ceaabe7ac..7dfa1e0a4 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypePackageImpl.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/impl/UsertypePackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: UsertypePackageImpl.java,v 1.6 2006/09/07 22:26:49 mtaal Exp $ + * $Id: UsertypePackageImpl.java,v 1.7 2006/11/13 14:52:45 mtaal Exp $ */ package org.eclipse.emf.teneo.samples.emf.hibernate.usertype.impl; @@ -15,6 +15,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Person; +import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypeFactory; import org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsertypePackage; @@ -40,6 +41,20 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage private EDataType nameEDataType = null; /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EDataType phoneNumberEDataType = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EDataType intArrayEDataType = null; + + /** * Creates an instance of the model <b>Package</b>, registered with * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package * package URI value. @@ -130,6 +145,33 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage * <!-- end-user-doc --> * @generated */ + public EAttribute getPerson_Numbers() { + return (EAttribute)personEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getPerson_PhoneNumbers() { + return (EAttribute)personEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getPerson_EmergencyContact() { + return (EAttribute)personEClass.getEStructuralFeatures().get(3); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EDataType getName_() { return nameEDataType; } @@ -139,6 +181,24 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage * <!-- end-user-doc --> * @generated */ + public EDataType getPhoneNumber() { + return phoneNumberEDataType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EDataType getIntArray() { + return intArrayEDataType; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public UsertypeFactory getUsertypeFactory() { return (UsertypeFactory)getEFactoryInstance(); } @@ -164,9 +224,14 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage // Create classes and their features personEClass = createEClass(PERSON); createEAttribute(personEClass, PERSON__NAME); + createEAttribute(personEClass, PERSON__NUMBERS); + createEAttribute(personEClass, PERSON__PHONE_NUMBERS); + createEAttribute(personEClass, PERSON__EMERGENCY_CONTACT); // Create data types nameEDataType = createEDataType(NAME); + phoneNumberEDataType = createEDataType(PHONE_NUMBER); + intArrayEDataType = createEDataType(INT_ARRAY); } /** @@ -197,9 +262,14 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage // Initialize classes and features; add operations and parameters initEClass(personEClass, Person.class, "Person", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getPerson_Name(), this.getName_(), "name", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_Numbers(), this.getIntArray(), "numbers", null, 1, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_PhoneNumbers(), this.getPhoneNumber(), "phoneNumbers", null, 0, 100, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getPerson_EmergencyContact(), this.getPhoneNumber(), "emergencyContact", "", 0, 1, Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); // Initialize data types initEDataType(nameEDataType, Name.class, "Name", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + initEDataType(phoneNumberEDataType, UsaPhoneNumber.class, "PhoneNumber", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); + initEDataType(intArrayEDataType, int[].class, "IntArray", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); // Create resource createResource(eNS_URI); @@ -223,8 +293,14 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage (nameEDataType, source, new String[] { - "appinfo", "\n\t\t\t\t\t\t@Type(type=\"org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType\")\n\t\t\t\t\t\t@Columns({@Column(name=\"first_name\"), @Column(name=\"last_name\")})\n\t\t\t\t\t" - }); + "appinfo", "\n\t\t\t\t\t\t@TypeDef(name=\"nameType\" typeClass=\"org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType\")\n\t\t\t\t\t\t@Columns({@Column(name=\"first_name\"), @Column(name=\"last_name\")})\n\t\t\t\t\t" + }); + addAnnotation + (intArrayEDataType, + source, + new String[] { + "appinfo", "\n\t\t\t\t\t\t@TypeDef(name=\"intArrayType\" typeClass=\"org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType\", parameters={@Parameter(name=\"epackage\" value=\"http://www.elver.org/samples/emf/hibernate/usertype\"), @Parameter(name=\"edatatype\", value=\"IntArray\")})\n\t\t\t\t\t" + }); } /** @@ -254,7 +330,20 @@ public class UsertypePackageImpl extends EPackageImpl implements UsertypePackage new String[] { "kind", "element", "name", "name" - }); + }); + addAnnotation + (getPerson_Numbers(), + source, + new String[] { + "kind", "element", + "name", "intArray" + }); + addAnnotation + (intArrayEDataType, + source, + new String[] { + "name", "IntArray" + }); } } //UsertypePackageImpl diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.genmodel b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.genmodel index 30f84fcbb..82f7612e2 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.genmodel +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.genmodel @@ -2,13 +2,18 @@ <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.hibernate.test/src" - modelPluginID="org.eclipse.emf.teneo.hibernate.test" modelName="UserType" importerID="org.eclipse.xsd.ecore.importer"> - <foreignModel>UserType.xsd</foreignModel> + modelPluginID="org.eclipse.emf.teneo.hibernate.test" modelName="UserType" importerID="org.eclipse.emf.importer.ecore"> + <foreignModel>usertype.ecore</foreignModel> <genPackages prefix="Usertype" basePackage="org.eclipse.emf.teneo.samples.emf.hibernate" resource="XML" disposableProviderFactory="true" ecorePackage="usertype.ecore#/"> <genDataTypes ecoreDataType="usertype.ecore#//Name"/> + <genDataTypes ecoreDataType="usertype.ecore#//PhoneNumber"/> + <genDataTypes ecoreDataType="usertype.ecore#//IntArray"/> <genClasses ecoreClass="usertype.ecore#//Person"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute usertype.ecore#//Person/name"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute usertype.ecore#//Person/numbers"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute usertype.ecore#//Person/phoneNumbers"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute usertype.ecore#//Person/emergencyContact"/> </genClasses> </genPackages> </genmodel:GenModel> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.xsd b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.xsd deleted file mode 100644 index c53c91a5b..000000000 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/UserType.xsd +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.elver.org/samples/emf/hibernate/usertype"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:this="http://www.elver.org/samples/emf/hibernate/usertype">
-
- <xsd:simpleType name="Name" ecore:instanceClass="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name">
- <xsd:annotation>
- <xsd:appinfo source="teneo.jpa"> - @Type(type="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType") - @Columns({@Column(name="first_name"), @Column(name="last_name")}) - </xsd:appinfo>
- </xsd:annotation>
- <xsd:restriction/>
- </xsd:simpleType>
-
- <xsd:complexType name="Person">
- <xsd:sequence>
- <xsd:element name="name" type="this:Name">
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/usertype.ecore b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/usertype.ecore index 75e8b81d2..35657d061 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/usertype.ecore +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/samples/emf/hibernate/usertype/model/usertype.ecore @@ -5,7 +5,7 @@ nsURI="http://www.elver.org/samples/emf/hibernate/usertype" nsPrefix="usertype"> <eClassifiers xsi:type="ecore:EDataType" name="Name" instanceClassName="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.Name"> <eAnnotations source="teneo.jpa"> - <details key="appinfo" value="
						@Type(type="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType")
						@Columns({@Column(name="first_name"), @Column(name="last_name")})
					"/> + <details key="appinfo" value="
						@TypeDef(name="nameType" typeClass="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.NameType")
						@Columns({@Column(name="first_name"), @Column(name="last_name")})
					"/> </eAnnotations> <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> <details key="name" value="Name"/> @@ -23,5 +23,25 @@ <details key="name" value="name"/> </eAnnotations> </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="numbers" unique="false" + lowerBound="1" eType="#//IntArray"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="kind" value="element"/> + <details key="name" value="intArray"/> + </eAnnotations> + </eStructuralFeatures> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="phoneNumbers" upperBound="100" + eType="#//PhoneNumber"/> + <eStructuralFeatures xsi:type="ecore:EAttribute" name="emergencyContact" eType="#//PhoneNumber" + defaultValueLiteral=""/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EDataType" name="PhoneNumber" instanceClassName="org.eclipse.emf.teneo.samples.emf.hibernate.usertype.UsaPhoneNumber"/> + <eClassifiers xsi:type="ecore:EDataType" name="IntArray" instanceClassName="int[]"> + <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData"> + <details key="name" value="IntArray"/> + </eAnnotations> + <eAnnotations source="teneo.jpa"> + <details key="appinfo" value="
						@TypeDef(name="intArrayType" typeClass="org.eclipse.emf.teneo.hibernate.mapping.DefaultToStringUserType", parameters={@Parameter(name="epackage" value="http://www.elver.org/samples/emf/hibernate/usertype"), @Parameter(name="edatatype", value="IntArray")})
					"/> + </eAnnotations> </eClassifiers> </ecore:EPackage> |