diff options
Diffstat (limited to 'tests/org.eclipse.emf.teneo.hibernate.test')
168 files changed, 1174 insertions, 751 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 db5acb5d0..a34504c3c 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,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 Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <id name="myid" type="long" column="`myid`"> 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 9df0dd647..f8f698077 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,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 Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <id name="myid" type="long" column="`myid`"> 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 4b3f33912..75f8b2be3 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,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 Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 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`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> 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 76e87581b..5e12814a8 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,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 Thu Sep 28 21:17:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.joincolumns.impl.PersonImpl" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> 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 ade85bd06..971521d16 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,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 Thu Sep 28 21:17:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 61a2ec6ef..acea02a7e 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,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 Thu Sep 28 21:17:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 47ec61c1b..a4bde5077 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 Thu Sep 28 21:18:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:04 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> @@ -26,7 +26,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`phones_id`" not-null="false" unique="false"/> + <column name="`person_phones_id`" not-null="false" unique="false"/> </key> <list-index column="`person_phones_idx`"/> <one-to-many entity-name="Person_phones"/> 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 ac4196147..c7c49bab1 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 Thu Sep 28 21:18:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:01 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> @@ -24,7 +24,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="phones" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`phones_id`" not-null="false" unique="false"/> + <column name="`person_phones_id`" not-null="false" unique="false"/> </key> <list-index column="`person_phones_idx`"/> <one-to-many entity-name="Person_phones"/> 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 c12aee31a..9c5e98e91 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 Thu Sep 28 21:18:13 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:03 CEST 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" discriminator-value="TestA" table="`testa`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> <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_id`"/> + <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> </class> <class entity-name="TestB" abstract="false" lazy="false" discriminator-value="TestB" table="`testb`"> @@ -32,7 +32,7 @@ <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`testb_id`" not-null="false" unique="false"/> + <column name="`testc_testb_id`" not-null="false" unique="false"/> </key> <list-index column="`testc_testb_idx`"/> <one-to-many entity-name="TestB"/> 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 9bd693b15..4064d041a 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 Thu Sep 28 21:18:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:01 CEST 2006 --> <hibernate-mapping> <class entity-name="TestA" abstract="false" lazy="false" table="`testa`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="true"/> <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_id`"/> + <column not-null="true" unique="false" name="`testb_testb_id`"/> </many-to-one> </class> <class entity-name="TestB" abstract="false" lazy="false" table="`testb`"> @@ -29,7 +29,7 @@ <property name="myDate" type="serializable" lazy="false" column="`mydate`" not-null="true"/> <list name="testB" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`testb_id`" not-null="false" unique="false"/> + <column name="`testc_testb_id`" not-null="false" unique="false"/> </key> <list-index column="`testc_testb_idx`"/> <one-to-many entity-name="TestB"/> 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 dd84effa6..95a983edd 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 Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" discriminator-value="Account" table="`account`"> <id type="long" name="e_id" column="e_id"> @@ -20,7 +20,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`account_id`" not-null="false" unique="false"/> + <column name="`accountgroup_account_id`" not-null="false" unique="false"/> </key> <list-index column="`accountgroup_account_idx`"/> <one-to-many entity-name="Account"/> @@ -35,27 +35,27 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`accountgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_accountgroup_idx`"/> <one-to-many entity-name="AccountGroup"/> </list> <list name="vat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`vat_id`" not-null="false" unique="false"/> + <column name="`accounting_vat_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_vat_idx`"/> <one-to-many entity-name="Vat"/> </list> <many-to-one name="vatAccount" entity-name="BalanceAccount" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vataccount_id`"/> + <column not-null="false" unique="false" name="`balanceaccount_vataccount_id`"/> </many-to-one> <many-to-one name="report" entity-name="Report" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`report_id`"/> + <column not-null="false" unique="false" name="`report_report_id`"/> </many-to-one> <list name="journalGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_journalgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_journalgroup_idx`"/> <one-to-many entity-name="JournalGroup"/> @@ -81,14 +81,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroups_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalgroups_idx`"/> <one-to-many entity-name="JournalGroup"/> </list> <list name="journalStatements" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalstatements_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalstatements_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalstatements_idx`"/> <one-to-many entity-name="JournalStatement"/> @@ -104,13 +104,13 @@ <property name="date" type="date" lazy="false" column="`date`" not-null="true" unique="false"/> <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> <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="`debitaccount_id`"/> + <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> <many-to-one name="creditAccount" 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="`creditaccount_id`"/> + <column not-null="true" unique="false" name="`account_creditaccount_id`"/> </many-to-one> <many-to-one name="vat" entity-name="Vat" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vat_id`"/> + <column not-null="false" unique="false" name="`vat_vat_id`"/> </many-to-one> </class> <subclass entity-name="PLAccount" abstract="false" lazy="false" extends="Account" discriminator-value="PLAccount"/> @@ -122,10 +122,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <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="`debitreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> <many-to-one name="creditReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_creditreportgroup_id`"/> </many-to-one> </class> <class entity-name="ReportGroup" abstract="false" lazy="false" discriminator-value="ReportGroup" table="`reportgroup`"> @@ -137,7 +137,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`reportgroup_id`" not-null="false" unique="false"/> + <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`reportgroup_reportgroup_idx`"/> <one-to-many entity-name="ReportGroup"/> 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 cba6b6234..8535e3581 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 Thu Sep 28 21:18:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:21 CEST 2006 --> <hibernate-mapping> <class entity-name="Account" abstract="true" lazy="false" table="`account`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="account" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`account_id`" not-null="false" unique="false"/> + <column name="`accountgroup_account_id`" not-null="false" unique="false"/> </key> <list-index column="`accountgroup_account_idx`"/> <one-to-many entity-name="Account"/> @@ -32,27 +32,27 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="accountGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`accountgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_accountgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_accountgroup_idx`"/> <one-to-many entity-name="AccountGroup"/> </list> <list name="vat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`vat_id`" not-null="false" unique="false"/> + <column name="`accounting_vat_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_vat_idx`"/> <one-to-many entity-name="Vat"/> </list> <many-to-one name="vatAccount" entity-name="BalanceAccount" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vataccount_id`"/> + <column not-null="false" unique="false" name="`balanceaccount_vataccount_id`"/> </many-to-one> <many-to-one name="report" entity-name="Report" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`report_id`"/> + <column not-null="false" unique="false" name="`report_report_id`"/> </many-to-one> <list name="journalGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroup_id`" not-null="false" unique="false"/> + <column name="`accounting_journalgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`accounting_journalgroup_idx`"/> <one-to-many entity-name="JournalGroup"/> @@ -80,14 +80,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="journalGroups" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalgroups_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalgroups_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalgroups_idx`"/> <one-to-many entity-name="JournalGroup"/> </list> <list name="journalStatements" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`journalstatements_id`" not-null="false" unique="false"/> + <column name="`journalgroup_journalstatements_id`" not-null="false" unique="false"/> </key> <list-index column="`journalgroup_journalstatements_idx`"/> <one-to-many entity-name="JournalStatement"/> @@ -102,13 +102,13 @@ <property name="date" type="date" lazy="false" column="`date`" not-null="true" unique="false"/> <property name="amount" type="float" lazy="false" column="`amount`" not-null="false"/> <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="`debitaccount_id`"/> + <column not-null="true" unique="false" name="`account_debitaccount_id`"/> </many-to-one> <many-to-one name="creditAccount" 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="`creditaccount_id`"/> + <column not-null="true" unique="false" name="`account_creditaccount_id`"/> </many-to-one> <many-to-one name="vat" entity-name="Vat" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`vat_id`"/> + <column not-null="false" unique="false" name="`vat_vat_id`"/> </many-to-one> </class> <joined-subclass entity-name="PLAccount" abstract="false" lazy="false" extends="Account" table="`placcount`"> @@ -123,10 +123,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <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="`debitreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_debitreportgroup_id`"/> </many-to-one> <many-to-one name="creditReportGroup" entity-name="ReportGroup" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`creditreportgroup_id`"/> + <column not-null="true" unique="false" name="`reportgroup_creditreportgroup_id`"/> </many-to-one> </class> <class entity-name="ReportGroup" abstract="false" lazy="false" table="`reportgroup`"> @@ -137,7 +137,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="reportGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`reportgroup_id`" not-null="false" unique="false"/> + <column name="`reportgroup_reportgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`reportgroup_reportgroup_idx`"/> <one-to-many entity-name="ReportGroup"/> 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 af19b257b..ade020bc5 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 Thu Sep 28 21:18:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:44 CEST 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" discriminator-value="CapacityEntry" table="`capacityentry`"> <id type="long" name="e_id" column="e_id"> @@ -19,7 +19,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <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_id`"/> + <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"/> @@ -34,7 +34,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="machines" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`machines_id`" not-null="false" unique="false"/> + <column name="`machinelist_machines_id`" not-null="false" unique="false"/> </key> <list-index column="`machinelist_machines_idx`"/> <one-to-many entity-name="Machine"/> @@ -60,10 +60,10 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="capacityEntry" entity-name="CapacityEntry" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`capacityentry_id`"/> + <column not-null="true" unique="false" name="`capacityentry_capacityentry_id`"/> </many-to-one> <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_id`"/> + <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"/> @@ -88,7 +88,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="days" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`days_id`" not-null="false" unique="false"/> + <column name="`workweek_days_id`" not-null="false" unique="false"/> </key> <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> 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 b607eb920..b9da4f8ae 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 Thu Sep 28 21:18:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:19 CEST 2006 --> <hibernate-mapping> <class entity-name="CapacityEntry" abstract="false" lazy="false" table="`capacityentry`"> <id type="long" name="e_id" column="e_id"> @@ -17,7 +17,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <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_id`"/> + <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"/> @@ -31,7 +31,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="machines" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`machines_id`" not-null="false" unique="false"/> + <column name="`machinelist_machines_id`" not-null="false" unique="false"/> </key> <list-index column="`machinelist_machines_idx`"/> <one-to-many entity-name="Machine"/> @@ -55,10 +55,10 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="capacityEntry" entity-name="CapacityEntry" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`capacityentry_id`"/> + <column not-null="true" unique="false" name="`capacityentry_capacityentry_id`"/> </many-to-one> <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_id`"/> + <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"/> @@ -81,7 +81,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="days" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`days_id`" not-null="false" unique="false"/> + <column name="`workweek_days_id`" not-null="false" unique="false"/> </key> <list-index column="`workweek_days_idx`"/> <one-to-many entity-name="WorkDay"/> 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 6d33faa37..080b01b07 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,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 Thu Sep 28 21:19:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:51 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -10,14 +10,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -32,7 +32,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <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="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> @@ -42,13 +42,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`"> 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 c26d86584..1ad99cb6b 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,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 Thu Sep 28 21:18:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:27 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,14 +9,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -30,7 +30,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <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="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> @@ -39,13 +39,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" table="`stringtype`"> 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 7accc8c46..c50952dc1 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,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 Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:45 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 2f289f719..8ec3bf8c3 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,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 Thu Sep 28 21:18:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 4da374c71..969db4f96 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 Thu Sep 28 21:19:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:58 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -9,8 +9,8 @@ </id> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> - <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`order_id`"/> + <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"/> @@ -42,16 +42,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`order_id`" not-null="false" unique="false"/> + <column name="`item_order_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`address_billto_id`"/> </many-to-one> <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="`shipto_id`"/> + <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" unique="true"/> @@ -60,11 +60,11 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> </property> - <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`customer_id`"/> + <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`purchaseorder_customer_id`"/> </many-to-one> <many-to-one name="previousOrder" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`previousorder_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_previousorder_id`"/> </many-to-one> </class> <class entity-name="Supplier" abstract="false" lazy="false" discriminator-value="Supplier" table="`supplier`"> @@ -76,14 +76,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`customers_id`" not-null="false" unique="false"/> + <column name="`supplier_customers_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_customers_idx`"/> <one-to-many entity-name="Customer"/> </list> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -98,7 +98,7 @@ <property name="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`customer_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> </key> <list-index column="`customer_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -108,7 +108,7 @@ <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`location_id`" not-null="true" unique="false"/> + <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> <element type="java.lang.String"/> 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 9ecf0443f..3edc564b3 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,15 +1,15 @@ <?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 Thu Sep 28 21:18:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id type="long" name="e_id" column="e_id"> <generator class="native"/> </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> - <many-to-one name="order" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`order_id`"/> + <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"/> @@ -42,16 +42,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`order_id`" not-null="false" unique="false"/> + <column name="`item_order_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> </list> <many-to-one name="billTo" entity-name="Address" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`billto_id`"/> + <column not-null="true" unique="false" name="`address_billto_id`"/> </many-to-one> <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="`shipto_id`"/> + <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" unique="true"/> @@ -60,11 +60,11 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.epo2.OrderStatus</param> </type> </property> - <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`customer_id`"/> + <many-to-one name="customer" entity-name="Customer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`purchaseorder_customer_id`"/> </many-to-one> <many-to-one name="previousOrder" entity-name="PurchaseOrder" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`previousorder_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_previousorder_id`"/> </many-to-one> </class> <class entity-name="Supplier" abstract="false" lazy="false" table="`supplier`"> @@ -75,14 +75,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="customers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`customers_id`" not-null="false" unique="false"/> + <column name="`supplier_customers_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_customers_idx`"/> <one-to-many entity-name="Customer"/> </list> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -96,7 +96,7 @@ <property name="customerID" type="int" lazy="false" column="`customerid`" not-null="false"/> <list name="orders" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`customer_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_customer_id`" not-null="false" unique="false"/> </key> <list-index column="`customer_orders_idx`"/> <one-to-many entity-name="PurchaseOrder"/> @@ -109,7 +109,7 @@ <property name="countryCode" type="int" lazy="false" column="`countrycode`" not-null="false"/> <list name="location" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`location_id`" not-null="true" unique="false"/> + <column name="`globaladdress_location_id`" not-null="true" unique="false"/> </key> <list-index column="`globaladdress_location_idx`"/> <element type="java.lang.String"/> 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 913c3baf3..c7db85215 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,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 Thu Sep 28 21:19:04 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 0280da238..ac4a8efbb 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,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 Thu Sep 28 21:18:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:26 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 10827e695..48979fac7 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,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 Thu Sep 28 21:19:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 86ee577f9..f01fef366 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,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 Thu Sep 28 21:18:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 21b83965d..2f26f766e 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 Thu Sep 28 21:19:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 52c53ecb7..a1fe97990 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 Thu Sep 28 21:18:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:26 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.schoollibrary.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 f6fc4d215..859134067 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,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 Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -13,7 +13,7 @@ <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"/> <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="`myr_id`"/> + <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> </class> <class entity-name="R" abstract="false" lazy="false" discriminator-value="R" table="`r`"> 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 c161905c4..28d0aa347 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,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 Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -12,7 +12,7 @@ <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"/> <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="`myr_id`"/> + <column not-null="false" unique="false" name="`r_myr_id`"/> </many-to-one> </class> <class entity-name="R" abstract="false" lazy="false" table="`r`"> 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 82e898e7f..301574471 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 Thu Sep 28 21:18:01 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="myid" column="myid"> @@ -28,7 +28,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <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_id`"/> + <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"/> </class> 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 a5767bab2..aacf7d9f5 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 Thu Sep 28 21:17:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:39 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="myid" column="myid"> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <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_id`"/> + <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"/> </class> 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 95c044294..f59c16495 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 Thu Sep 28 21:18:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 cadf1d76c..96bd5b7e9 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 Thu Sep 28 21:17:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:45 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 a320aae4a..e76e857e7 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 Thu Sep 28 21:18:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" discriminator-value="Basic" table="`basic`"> <id type="long" name="e_id" column="e_id"> 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 c7ebdc4d6..9242967ba 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 Thu Sep 28 21:17:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:42 CEST 2006 --> <hibernate-mapping> <class entity-name="Basic" abstract="false" lazy="false" table="`basic`"> <id type="long" name="e_id" column="e_id"> 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 04a5f3265..73424a64b 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 Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> 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 d4c486f19..5157d22e8 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 Thu Sep 28 21:17:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> 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 eeec153b3..293c681db 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,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 Thu Sep 28 21:18:06 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:56 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 967a4f184..0dd4daeed 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,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 Thu Sep 28 21:17:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.cascadenotall.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh,delete"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 8ed53e675..76b390932 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,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 Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 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`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> @@ -14,8 +14,8 @@ <subclass entity-name="Parent" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.ParentImpl" extends="Person" discriminator-value="Parent"> <list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`children_firstname`" not-null="false" unique="false"/> - <column name="`children_lastname`" not-null="false" unique="false"/> + <column name="`parent_children_firstname`" not-null="false" unique="false"/> + <column name="`parent_children_lastname`" not-null="false" unique="false"/> </key> <list-index column="`parent_children_idx`"/> <one-to-many entity-name="Child"/> 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 c88ef2d2d..0f69c26f5 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,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 Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.impl.PersonImpl" table="`person`"> <composite-id class="org.eclipse.emf.teneo.samples.emf.annotations.compositeid.PersonID" mapped="true"> @@ -17,8 +17,8 @@ </key> <list name="children" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`children_firstname`" not-null="false" unique="false"/> - <column name="`children_lastname`" not-null="false" unique="false"/> + <column name="`parent_children_firstname`" not-null="false" unique="false"/> + <column name="`parent_children_lastname`" not-null="false" unique="false"/> </key> <list-index column="`parent_children_idx`"/> <one-to-many entity-name="Child"/> 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 e301d3cf2..1b676b084 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 Thu Sep 28 21:18:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" discriminator-value="ChildItem" table="`childitem`"> <id type="long" name="e_id" column="e_id"> @@ -18,10 +18,12 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="childItem" table="item_childitem" lazy="true" cascade="all,delete-orphan"> - <key/> + <list name="childItem" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`item_childitem_id`" not-null="false" unique="false"/> + </key> <list-index column="`item_childitem_idx`"/> - <many-to-many entity-name="ChildItem" unique="false"/> + <one-to-many entity-name="ChildItem"/> </list> </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.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 776dfc758..d04e54490 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 Thu Sep 28 21:17:53 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:27 CEST 2006 --> <hibernate-mapping> <class entity-name="ChildItem" abstract="false" lazy="false" table="`childitem`"> <id type="long" name="e_id" column="e_id"> @@ -16,10 +16,12 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="childItem" table="item_childitem" lazy="true" cascade="all,delete-orphan"> - <key/> + <list name="childItem" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`item_childitem_id`" not-null="false" unique="false"/> + </key> <list-index column="`item_childitem_idx`"/> - <many-to-many entity-name="ChildItem" unique="false"/> + <one-to-many entity-name="ChildItem"/> </list> </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_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 04a5f3265..73424a64b 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 Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> 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 c0c330164..5157d22e8 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 Thu Sep 28 21:17:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`mybooktable`"> <id type="long" name="e_id" column="e_id"> 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 f465ea68c..0963a705b 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 Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" discriminator-value="Embedder" table="`embedder`"> <id type="long" name="e_id" column="e_id"> @@ -33,7 +33,7 @@ </component> <list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`fourthembedded_id`" not-null="true" unique="false"/> + <column name="`embedder_fourthembedded_id`" not-null="true" unique="false"/> </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> 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 4b993aee9..50e933e9d 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 Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="Embedder" abstract="false" lazy="false" table="`embedder`"> <id type="long" name="e_id" column="e_id"> @@ -32,7 +32,7 @@ </component> <list name="fourthEmbedded" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`fourthembedded_id`" not-null="true" unique="false"/> + <column name="`embedder_fourthembedded_id`" not-null="true" unique="false"/> </key> <list-index column="`embedder_fourthembedded_idx`"/> <composite-element class="Embeddable"> 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 a0a6060a9..93ab2f13e 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,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 Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 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`"> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> 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 29ff696b8..68ed63754 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,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 Thu Sep 28 21:17:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" name="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.PersonImpl" table="`person`"> <composite-id name="name" class="org.eclipse.emf.teneo.samples.emf.annotations.embeddedid.impl.NameImpl"> 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 9ca744b6c..4a92e3d0b 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,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 Thu Sep 28 21:18:02 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:54 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" discriminator-value="IdentityID" table="`identityid`"> <id name="myid" type="long" column="`myid`"> 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 600545ab3..e529075a0 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,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 Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:40 CEST 2006 --> <hibernate-mapping> <class entity-name="IdentityID" abstract="false" lazy="false" table="`identityid`"> <id name="myid" type="long" column="`myid`"> 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 5a6f14e81..d6b2b5092 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 Thu Sep 28 21:17:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:50 CEST 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" discriminator-value="User" table="`user`"> <id type="long" name="e_id" column="e_id"> @@ -15,7 +15,7 @@ <generator class="increment"/> </collection-id> <key update="true"> - <column name="`roles_id`" not-null="true" unique="false"/> + <column name="`user_roles_id`" not-null="true" unique="false"/> </key> <element type="java.lang.String"/> </idbag> 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 4f4a2084e..52a7535ed 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 Thu Sep 28 21:17:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:36 CEST 2006 --> <hibernate-mapping> <class entity-name="User" abstract="false" lazy="false" table="`user`"> <id type="long" name="e_id" column="e_id"> @@ -14,7 +14,7 @@ <generator class="increment"/> </collection-id> <key update="true"> - <column name="`roles_id`" not-null="true" unique="false"/> + <column name="`user_roles_id`" not-null="true" unique="false"/> </key> <element type="java.lang.String"/> </idbag> 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 bfd0a047b..a6df1081b 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,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 Thu Sep 28 21:17:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:47 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -15,14 +15,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_name`" not-null="false" unique="false"/> + <column name="`contentlist_address_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_address_idx`"/> <one-to-many entity-name="Address"/> </list> <list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`price_name`" not-null="false" unique="false"/> + <column name="`contentlist_price_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_price_idx`"/> <one-to-many entity-name="Price"/> 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 5878d46f5..ba6c6624b 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,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 Thu Sep 28 21:17:38 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:32 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -14,14 +14,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_name`" not-null="false" unique="false"/> + <column name="`contentlist_address_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_address_idx`"/> <one-to-many entity-name="Address"/> </list> <list name="price" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`price_name`" not-null="false" unique="false"/> + <column name="`contentlist_price_name`" not-null="false" unique="false"/> </key> <list-index column="`contentlist_price_idx`"/> <one-to-many entity-name="Price"/> 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 ce785cd47..d7e023f5f 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,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 Thu Sep 28 21:17:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:48 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 aed1ea8fe..990a89923 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,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 Thu Sep 28 21:17:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:33 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.annotations.lazy.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 92cbd798d..922a1b8b2 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 Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 228bafd21..3bb6fd8e8 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 Thu Sep 28 21:17:54 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> 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 627e8eca5..ee3e3de9a 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 Thu Sep 28 21:17:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:51 CEST 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" discriminator-value="Cntr" table="`cntr`"> <id type="long" name="e_id" column="e_id"> 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 fcdcdd248..a4d9a2a54 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 Thu Sep 28 21:17:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:37 CEST 2006 --> <hibernate-mapping> <class entity-name="Cntr" abstract="false" lazy="false" table="`cntr`"> <id type="long" name="e_id" column="e_id"> 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 36e998da2..84f4802b9 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 Thu Sep 28 21:18:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="SpecificDocument" abstract="false" lazy="false" discriminator-value="SpecificDocument" table="`specificdocument`"> <id name="myId" type="long" column="`myid`"/> 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 c445510d7..871a24615 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 Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="SpecificDocument" abstract="false" lazy="false" table="`specificdocument`"> <id name="myId" type="long" column="`myid`"/> 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 d4a771e48..eff65ecdc 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,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 Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:57 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <id name="theID" type="long" column="`theid`"/> 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 4158c60da..1aa07ef76 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,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 Thu Sep 28 21:17:51 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <id name="theID" type="long" column="`theid`"/> 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 589cac3ad..f75389062 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,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 Thu Sep 28 21:17:58 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:51 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`PERSON`"> <id name="id" type="long" column="`ID`"/> 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 65b8e50fa..5da6a2019 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,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 Thu Sep 28 21:17:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:37 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`PERSON`"> <id name="id" type="long" column="`ID`"/> 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 db217bea0..feeab1e7c 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 Thu Sep 28 21:18:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -18,8 +18,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <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> </class> <class entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`"> @@ -31,13 +31,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> 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 5ba3d92de..d31883c31 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 Thu Sep 28 21:17:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <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> </class> <class entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`"> @@ -28,13 +28,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> 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 72ac16722..819012c22 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 Thu Sep 28 21:18:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:58 CEST 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" discriminator-value="MyItem" table="`myitem`"> <id type="long" name="e_id" column="e_id"> @@ -26,14 +26,13 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> + <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"/> </key> - <list-index column="`youritem_myitem_idx`"/> <many-to-many entity-name="MyItem" unique="false"> <column name="`myitem_id`" not-null="true" unique="false"/> </many-to-many> - </list> + </bag> </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.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 f355fb3db..b150c2343 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 Thu Sep 28 21:17:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:45 CEST 2006 --> <hibernate-mapping> <class entity-name="MyItem" abstract="false" lazy="false" table="`myitem`"> <id type="long" name="e_id" column="e_id"> @@ -24,14 +24,13 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <list name="myItem" lazy="true" cascade="merge,persist,save-update,lock,refresh" table="youritem_myitem"> + <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"/> </key> - <list-index column="`youritem_myitem_idx`"/> <many-to-many entity-name="MyItem" unique="false"> <column name="`myitem_id`" not-null="true" unique="false"/> </many-to-many> - </list> + </bag> </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.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 73e1b1048..5764a3a84 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 Thu Sep 28 21:18:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:58 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" discriminator-value="ContainedItem" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -18,8 +18,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <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> </class> <class entity-name="ItemList" abstract="false" lazy="false" discriminator-value="ItemList" table="`itemlist`"> @@ -31,13 +31,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> 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 647f5f72c..9ac291add 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 Thu Sep 28 21:17:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:44 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedItem" abstract="false" lazy="false" table="`containeditem`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="itemList" entity-name="ItemList" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`itemlist_id`"/> + <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> </class> <class entity-name="ItemList" abstract="false" lazy="false" table="`itemlist`"> @@ -28,13 +28,13 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <bag name="containedItem" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containeditem_id`" not-null="false" unique="false"/> + <column name="`itemlist_containeditem_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="ContainedItem"/> </bag> <bag name="item" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`itemlist_id`" not-null="false" unique="false"/> + <column name="`item_itemlist_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> 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 1dd48e2ac..86b091885 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 Thu Sep 28 21:17:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:49 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -27,7 +27,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <one-to-one name="head" entity-name="Head" cascade="all" lazy="false"/> </class> 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 b2a01c1c5..b12f48cd4 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 Thu Sep 28 21:17:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -24,7 +24,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="address" entity-name="Address" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`address_id`"/> + <column not-null="false" unique="false" name="`address_address_id`"/> </many-to-one> <one-to-one name="head" entity-name="Head" cascade="all" lazy="false"/> </class> 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 26ab44b76..64972e3fb 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,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 Thu Sep 28 21:18:05 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" discriminator-value="Body" table="`body`"> <id name="theID" type="long" column="`theid`"/> 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 efc437475..90759a676 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,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 Thu Sep 28 21:17:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:41 CEST 2006 --> <hibernate-mapping> <class entity-name="Body" abstract="false" lazy="false" table="`body`"> <id name="theID" type="long" column="`theid`"/> 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 7a71df43c..97d54090e 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 Thu Sep 28 21:18:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:47 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`myitemtable`"> <id type="long" name="e_id" column="e_id"> 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 3e189f0d3..ef9331e80 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 Thu Sep 28 21:17:50 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:47:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`myitemtable`"> <id type="long" name="e_id" column="e_id"> 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 1681e346f..00b073640 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 Thu Sep 28 21:18:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:02 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" discriminator-value="Contacts" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -11,14 +11,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> </list> <list name="containedPersons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containedpersons_id`" not-null="false" unique="false"/> + <column name="`contacts_containedpersons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_containedpersons_idx`"/> <one-to-many entity-name="Person"/> @@ -33,7 +33,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`children_id`" not-null="false" unique="false"/> + <column name="`person_children_id`" not-null="false" unique="false"/> </key> <list-index column="`person_children_idx`"/> <one-to-many entity-name="Person"/> 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 5469abbb0..5f3fddafc 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 Thu Sep 28 21:18:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:00 CEST 2006 --> <hibernate-mapping> <class entity-name="Contacts" abstract="false" lazy="false" table="`contacts`"> <id type="long" name="e_id" column="e_id"> @@ -10,14 +10,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persons" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`persons_id`" not-null="false" unique="false"/> + <column name="`contacts_persons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_persons_idx`"/> <one-to-many entity-name="Person"/> </list> <list name="containedPersons" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`containedpersons_id`" not-null="false" unique="false"/> + <column name="`contacts_containedpersons_id`" not-null="false" unique="false"/> </key> <list-index column="`contacts_containedpersons_idx`"/> <one-to-many entity-name="Person"/> @@ -31,7 +31,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="children" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`children_id`" not-null="false" unique="false"/> + <column name="`person_children_id`" not-null="false" unique="false"/> </key> <list-index column="`person_children_idx`"/> <one-to-many entity-name="Person"/> 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 7770862c0..c1278aab8 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,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 Thu Sep 28 21:18:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:06 CEST 2006 --> <hibernate-mapping> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" discriminator-value="PriceByQuantityType" table="`pricebyquantitytype`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_name`" not-null="false" unique="false"/> + <column name="`producttype_group_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> @@ -30,7 +30,7 @@ </property> <list name="group1" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group1_name`" not-null="false" unique="false"/> + <column name="`producttype_group1_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group1_idx`"/> <one-to-many entity-name="ProductType_group1"/> @@ -45,7 +45,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <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="`translateddescription_id`"/> + <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> </class> <class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`"> @@ -56,10 +56,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricebyquantity_id`"/> + <column not-null="false" unique="false" name="`pricebyquantitytype_pricebyquantity_id`"/> </many-to-one> <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="`pricefromsupplier_id`"/> + <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"/> </class> 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 659ae85c2..b8132feae 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,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 Thu Sep 28 21:18:14 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:05 CEST 2006 --> <hibernate-mapping> <class entity-name="PriceByQuantityType" abstract="false" lazy="false" table="`pricebyquantitytype`"> <id type="long" name="e_id" column="e_id"> @@ -16,7 +16,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_name`" not-null="false" unique="false"/> + <column name="`producttype_group_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group_idx`"/> <one-to-many entity-name="ProductType_group"/> @@ -28,7 +28,7 @@ </property> <list name="group1" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group1_name`" not-null="false" unique="false"/> + <column name="`producttype_group1_name`" not-null="false" unique="false"/> </key> <list-index column="`producttype_group1_idx`"/> <one-to-many entity-name="ProductType_group1"/> @@ -43,7 +43,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <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="`translateddescription_id`"/> + <column not-null="false" unique="false" name="`translateddescriptiontype_translateddescription_id`"/> </many-to-one> </class> <class entity-name="ProductType_group1" lazy="false" table="`producttype_group1`"> @@ -54,10 +54,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="priceByQuantity" entity-name="PriceByQuantityType" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`pricebyquantity_id`"/> + <column not-null="false" unique="false" name="`pricebyquantitytype_pricebyquantity_id`"/> </many-to-one> <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="`pricefromsupplier_id`"/> + <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"/> </class> 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 22e50e90a..deb21b016 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 Thu Sep 28 21:18:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:12 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" discriminator-value="ContainedChildNR" table="`containedchildnr`"> <id type="long" name="e_id" column="e_id"> @@ -27,16 +27,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <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="`containedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> <many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`containedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`notcontainedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`notcontainedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> <many-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> 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 4d89f4eb3..7fbf950d6 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 Thu Sep 28 21:18:20 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:07 CEST 2006 --> <hibernate-mapping> <class entity-name="ContainedChildNR" abstract="false" lazy="false" table="`containedchildnr`"> <id type="long" name="e_id" column="e_id"> @@ -24,16 +24,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <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="`containedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`containedchildr_containedonewayrequired_id`"/> </many-to-one> <many-to-one name="containedoneWaynotrequired" entity-name="ContainedChildNR" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`containedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`containedchildnr_containedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewayrequired" entity-name="NotContainedChildR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`notcontainedonewayrequired_id`"/> + <column not-null="true" unique="false" name="`notcontainedchildr_notcontainedonewayrequired_id`"/> </many-to-one> <many-to-one name="notcontainedonewaynotrequired" entity-name="NotContainedChildNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`notcontainedonewaynotrequired_id`"/> + <column not-null="false" unique="false" name="`notcontainedchildnr_notcontainedonewaynotrequired_id`"/> </many-to-one> <many-to-one name="notcontainedtwowaynotrequired" entity-name="NotContainedChildNRT" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> <many-to-one name="notcontainedtwowayrequirednr" entity-name="NotContainedChildRTNR" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" unique="true"/> 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 558e79649..63cee782e 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 Thu Sep 28 21:18:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:14 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <id type="long" name="e_id" column="e_id"> @@ -12,56 +12,56 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecr_id`" not-null="false" unique="false"/> + <column name="`main_onecr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecr_idx`"/> <one-to-many entity-name="OneCR"/> </list> <list name="onecn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecn_id`" not-null="false" unique="false"/> + <column name="`main_onecn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecn_idx`"/> <one-to-many entity-name="OneCN"/> </list> <list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenr_id`" not-null="false" unique="false"/> + <column name="`main_onenr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenr_idx`"/> <one-to-many entity-name="OneNR"/> </list> <list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenn_id`" not-null="false" unique="false"/> + <column name="`main_onenn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenn_idx`"/> <one-to-many entity-name="OneNN"/> </list> <list name="twocr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocr_idx`"/> <one-to-many entity-name="TwoCR"/> </list> <list name="twocn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocn_idx`"/> <one-to-many entity-name="TwoCN"/> </list> <list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonr_idx`"/> <one-to-many entity-name="TwoNR"/> </list> <list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonn_idx`"/> <one-to-many entity-name="TwoNN"/> @@ -106,8 +106,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoCR" abstract="false" lazy="false" discriminator-value="TwoCR" table="`twocr`"> @@ -117,8 +117,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoNN" abstract="false" lazy="false" discriminator-value="TwoNN" table="`twonn`"> @@ -128,8 +128,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoNR" abstract="false" lazy="false" discriminator-value="TwoNR" table="`twonr`"> @@ -139,8 +139,8 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </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_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 3090e6eba..8e96f656c 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 Thu Sep 28 21:18:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:10 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <id type="long" name="e_id" column="e_id"> @@ -11,56 +11,56 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="onecr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecr_id`" not-null="false" unique="false"/> + <column name="`main_onecr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecr_idx`"/> <one-to-many entity-name="OneCR"/> </list> <list name="onecn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`onecn_id`" not-null="false" unique="false"/> + <column name="`main_onecn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onecn_idx`"/> <one-to-many entity-name="OneCN"/> </list> <list name="onenr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenr_id`" not-null="false" unique="false"/> + <column name="`main_onenr_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenr_idx`"/> <one-to-many entity-name="OneNR"/> </list> <list name="onenn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`onenn_id`" not-null="false" unique="false"/> + <column name="`main_onenn_id`" not-null="false" unique="false"/> </key> <list-index column="`main_onenn_idx`"/> <one-to-many entity-name="OneNN"/> </list> <list name="twocr" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocr_idx`"/> <one-to-many entity-name="TwoCR"/> </list> <list name="twocn" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twocn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twocn_idx`"/> <one-to-many entity-name="TwoCN"/> </list> <list name="twonr" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonr_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonr_idx`"/> <one-to-many entity-name="TwoNR"/> </list> <list name="twonn" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`main_id`" not-null="false" unique="false"/> + <column name="`twonn_main_id`" not-null="false" unique="false"/> </key> <list-index column="`main_twonn_idx`"/> <one-to-many entity-name="TwoNN"/> @@ -100,8 +100,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoCR" abstract="false" lazy="false" table="`twocr`"> @@ -110,8 +110,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoNN" abstract="false" lazy="false" table="`twonn`"> @@ -120,8 +120,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </class> <class entity-name="TwoNR" abstract="false" lazy="false" table="`twonr`"> @@ -130,8 +130,8 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> - <many-to-one name="main" entity-name="Main" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`main_id`"/> + <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> </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.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 a9e1d1d4f..0aa57d75d 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 Thu Sep 28 21:18:30 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:16 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" discriminator-value="Main" table="`main`"> <id type="long" name="e_id" column="e_id"> 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 5f203821c..0486ad67b 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 Thu Sep 28 21:18:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:11 CEST 2006 --> <hibernate-mapping> <class entity-name="Main" abstract="false" lazy="false" table="`main`"> <id type="long" name="e_id" column="e_id"> 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 76c559e36..df688d4c9 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,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 Thu Sep 28 21:19:09 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:54 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" discriminator-value="CatalogType" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -10,14 +10,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -32,7 +32,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <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="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> @@ -42,13 +42,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" discriminator-value="StringType" table="`stringtype`"> 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 7afc0df8b..c010fb09b 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,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 Thu Sep 28 21:18:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:30 CEST 2006 --> <hibernate-mapping> <class entity-name="CatalogType" abstract="false" lazy="false" table="`catalogtype`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,14 +9,14 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="true"/> <list name="subCatalog" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`subcatalog_name`" not-null="false" unique="false"/> + <column name="`catalogtype_subcatalog_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_subcatalog_idx`"/> <one-to-many entity-name="CatalogType"/> </list> <list name="product" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`product_name`" not-null="false" unique="false"/> + <column name="`catalogtype_product_name`" not-null="false" unique="false"/> </key> <list-index column="`catalogtype_product_idx`"/> <one-to-many entity-name="ProductType"/> @@ -30,7 +30,7 @@ <property name="price" type="double" lazy="false" column="`price`" not-null="false"/> <property name="quantityTo" type="double" lazy="false" column="`quantityto`" not-null="false"/> <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="`supplier_id`"/> + <column not-null="true" unique="false" name="`suppliertype_supplier_id`"/> </many-to-one> </class> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> @@ -39,13 +39,13 @@ <property name="description" type="java.lang.String" lazy="false" column="`description`" not-null="false"/> <list name="remark" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`remark_code`" not-null="false" unique="false"/> + <column name="`producttype_remark_code`" not-null="false" unique="false"/> </key> <list-index column="`producttype_remark_idx`"/> <one-to-many entity-name="StringType"/> </list> <many-to-one name="price" entity-name="PriceType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`price_id`"/> + <column not-null="true" unique="false" name="`pricetype_price_id`"/> </many-to-one> </class> <class entity-name="StringType" abstract="false" lazy="false" table="`stringtype`"> 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 ac7dc8755..b23c9068b 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 Thu Sep 28 21:18:56 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:41 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`person_group_id`" not-null="false" unique="false"/> </key> <list-index column="`person_group_idx`"/> <one-to-many entity-name="Person_group"/> 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 fd51f2dbc..32ffca0cc 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 Thu Sep 28 21:18:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:17 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`person_group_id`" not-null="false" unique="false"/> </key> <list-index column="`person_group_idx`"/> <one-to-many entity-name="Person_group"/> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml new file mode 100644 index 000000000..37be34540 --- /dev/null +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_a_o/hibernate.hbm.xml @@ -0,0 +1,187 @@ +<?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 Fri Sep 29 11:01:35 CEST 2006 --> +<hibernate-mapping> + <class entity-name="EObject" abstract="false" lazy="false" discriminator-value="EObject" table="`eobject`"> + <id type="long" name="e_id" column="e_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"/> + </class> + <subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" discriminator-value="EModelElement"> + <list name="eAnnotations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_emodelelement_id`" not-null="false" unique="false"/> + </key> + <list-index column="`emodelelement_eannotations_idx`"/> + <one-to-many entity-name="EAnnotation"/> + </list> + </subclass> + <subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" discriminator-value="ENamedElement"> + <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + </subclass> + <subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="ETypedElement"> + <property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/> + <property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/> + <property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/> + <property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/> + <many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_etype_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" discriminator-value="EStructuralFeature"> + <property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/> + <property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/> + <property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/> + <property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/> + <property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/> + <property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EAttribute"> + <property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/> + </subclass> + <subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EAnnotation"> + <property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/> + <list name="details" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_details_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_details_idx`"/> + <one-to-many entity-name="EStringToStringMapEntry"/> + </list> + <many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/> + </many-to-one> + <list name="contents" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_contents_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_contents_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + <list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eannotation_references_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_references_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + </subclass> + <subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" discriminator-value="EClassifier"> + <property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/> + <many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_epackage_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EClass"> + <property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/> + <property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/> + <list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eclass_esupertypes_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_esupertypes_idx`"/> + <one-to-many entity-name="EClass"/> + </list> + <list name="eOperations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eoperation_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_eoperations_idx`"/> + <one-to-many entity-name="EOperation"/> + </list> + <list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`estructuralfeature_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_estructuralfeatures_idx`"/> + <one-to-many entity-name="EStructuralFeature"/> + </list> + </subclass> + <subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" discriminator-value="EDataType"> + <property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/> + </subclass> + <subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" discriminator-value="EEnum"> + <list name="eLiterals" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eenumliteral_eenum_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eenum_eliterals_idx`"/> + <one-to-many entity-name="EEnumLiteral"/> + </list> + </subclass> + <subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EEnumLiteral"> + <property name="value" type="int" lazy="false" column="`value`" not-null="false"/> + <property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/> + <many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" discriminator-value="EFactory"/> + <subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EOperation"> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eoperation_econtainingclass_id`"/> + </many-to-one> + <list name="eParameters" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eparameter_eoperation_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eparameters_idx`"/> + <one-to-many entity-name="EParameter"/> + </list> + <list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eoperation_eexceptions_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eexceptions_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + </subclass> + <subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" discriminator-value="EPackage"> + <property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/> + <property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/> + <list name="eClassifiers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eclassifier_epackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_eclassifiers_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + <list name="eSubpackages" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`epackage_esuperpackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_esubpackages_idx`"/> + <one-to-many entity-name="EPackage"/> + </list> + <many-to-one name="eSuperPackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`epackage_esuperpackage_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" discriminator-value="EParameter"> + <many-to-one name="eOperation" entity-name="EOperation" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eparameter_eoperation_id`"/> + </many-to-one> + </subclass> + <subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" discriminator-value="EReference"> + <property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/> + <property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/> + <many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`ereference_eopposite_id`"/> + </many-to-one> + </subclass> + <class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" discriminator-value="EStringToStringMapEntry" table="`estringtostringmapentry`"> + <id type="long" name="e_id" column="e_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"/> + <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"/> + </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.EcoreAction/mysql_s_o/hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_s_o/hibernate.hbm.xml new file mode 100644 index 000000000..6c19ca93e --- /dev/null +++ b/tests/org.eclipse.emf.teneo.hibernate.test/run/org.eclipse.emf.teneo.test.emf.sample.EcoreAction/mysql_s_o/hibernate.hbm.xml @@ -0,0 +1,234 @@ +<?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 Fri Sep 29 11:00:58 CEST 2006 --> +<hibernate-mapping> + <class entity-name="EObject" abstract="false" lazy="false" table="`eobject`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + </class> + <joined-subclass entity-name="EModelElement" abstract="true" lazy="false" extends="EObject" table="`emodelelement`"> + <key> + <column name="`eobject_id`"/> + </key> + <list name="eAnnotations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_emodelelement_id`" not-null="false" unique="false"/> + </key> + <list-index column="`emodelelement_eannotations_idx`"/> + <one-to-many entity-name="EAnnotation"/> + </list> + </joined-subclass> + <joined-subclass entity-name="ENamedElement" abstract="true" lazy="false" extends="EModelElement" table="`enamedelement`"> + <key> + <column name="`emodelelement_id`"/> + </key> + <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="ETypedElement" abstract="true" lazy="false" extends="ENamedElement" table="`etypedelement`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="ordered" type="boolean" lazy="false" column="`ordered`" not-null="false"/> + <property name="unique" type="boolean" lazy="false" column="`unique`" not-null="false"/> + <property name="lowerBound" type="int" lazy="false" column="`lowerbound`" not-null="false"/> + <property name="upperBound" type="int" lazy="false" column="`upperbound`" not-null="false"/> + <many-to-one name="eType" entity-name="EClassifier" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_etype_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EStructuralFeature" abstract="true" lazy="false" extends="ETypedElement" table="`estructuralfeature`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <property name="changeable" type="boolean" lazy="false" column="`changeable`" not-null="false"/> + <property name="volatile" type="boolean" lazy="false" column="`volatile`" not-null="false"/> + <property name="transient" type="boolean" lazy="false" column="`transient`" not-null="false"/> + <property name="defaultValueLiteral" type="java.lang.String" lazy="false" column="`defaultvalueliteral`" not-null="false"/> + <property name="unsettable" type="boolean" lazy="false" column="`unsettable`" not-null="false"/> + <property name="derived" type="boolean" lazy="false" column="`derived`" not-null="false"/> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`estructuralfeature_econtainingclass_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EAttribute" abstract="false" lazy="false" extends="EStructuralFeature" table="`eattribute`"> + <key> + <column name="`estructuralfeature_id`"/> + </key> + <property name="iD" type="boolean" lazy="false" column="`id`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="EAnnotation" abstract="false" lazy="false" extends="EModelElement" table="`eannotation`"> + <key> + <column name="`emodelelement_id`"/> + </key> + <property name="source" type="java.lang.String" lazy="false" column="`source`" not-null="false"/> + <list name="details" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_details_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_details_idx`"/> + <one-to-many entity-name="EStringToStringMapEntry"/> + </list> + <many-to-one name="eModelElement" entity-name="EModelElement" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eannotation_emodelelement_id`"/> + </many-to-one> + <list name="contents" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eannotation_contents_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_contents_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + <list name="references" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eannotation_references_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eannotation_references_idx`"/> + <one-to-many entity-name="EObject"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EClassifier" abstract="true" lazy="false" extends="ENamedElement" table="`eclassifier`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="instanceClassName" type="java.lang.String" lazy="false" column="`instanceclassname`" not-null="false"/> + <many-to-one name="ePackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eclassifier_epackage_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EClass" abstract="false" lazy="false" extends="EClassifier" table="`eclass`"> + <key> + <column name="`eclassifier_id`"/> + </key> + <property name="abstract" type="boolean" lazy="false" column="`abstract`" not-null="false"/> + <property name="interface" type="boolean" lazy="false" column="`interface`" not-null="false"/> + <list name="eSuperTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eclass_esupertypes_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_esupertypes_idx`"/> + <one-to-many entity-name="EClass"/> + </list> + <list name="eOperations" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eoperation_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_eoperations_idx`"/> + <one-to-many entity-name="EOperation"/> + </list> + <list name="eStructuralFeatures" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`estructuralfeature_econtainingclass_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eclass_estructuralfeatures_idx`"/> + <one-to-many entity-name="EStructuralFeature"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EDataType" abstract="false" lazy="false" extends="EClassifier" table="`edatatype`"> + <key> + <column name="`eclassifier_id`"/> + </key> + <property name="serializable" type="boolean" lazy="false" column="`serializable`" not-null="false"/> + </joined-subclass> + <joined-subclass entity-name="EEnum" abstract="false" lazy="false" extends="EDataType" table="`eenum`"> + <key> + <column name="`edatatype_id`"/> + </key> + <list name="eLiterals" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eenumliteral_eenum_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eenum_eliterals_idx`"/> + <one-to-many entity-name="EEnumLiteral"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EEnumLiteral" abstract="false" lazy="false" extends="ENamedElement" table="`eenumliteral`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="value" type="int" lazy="false" column="`value`" not-null="false"/> + <property name="literal" type="java.lang.String" lazy="false" column="`literal`" not-null="false"/> + <many-to-one name="eEnum" entity-name="EEnum" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eenumliteral_eenum_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EFactory" abstract="false" lazy="false" extends="EModelElement" table="`efactory`"> + <key> + <column name="`emodelelement_id`"/> + </key> + </joined-subclass> + <joined-subclass entity-name="EOperation" abstract="false" lazy="false" extends="ETypedElement" table="`eoperation`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <many-to-one name="eContainingClass" entity-name="EClass" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eoperation_econtainingclass_id`"/> + </many-to-one> + <list name="eParameters" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eparameter_eoperation_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eparameters_idx`"/> + <one-to-many entity-name="EParameter"/> + </list> + <list name="eExceptions" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true"> + <column name="`eoperation_eexceptions_id`" not-null="false" unique="false"/> + </key> + <list-index column="`eoperation_eexceptions_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + </joined-subclass> + <joined-subclass entity-name="EPackage" abstract="false" lazy="false" extends="ENamedElement" table="`epackage`"> + <key> + <column name="`enamedelement_id`"/> + </key> + <property name="nsURI" type="java.lang.String" lazy="false" column="`nsuri`" not-null="false"/> + <property name="nsPrefix" type="java.lang.String" lazy="false" column="`nsprefix`" not-null="false"/> + <list name="eClassifiers" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`eclassifier_epackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_eclassifiers_idx`"/> + <one-to-many entity-name="EClassifier"/> + </list> + <list name="eSubpackages" lazy="true" cascade="all,delete-orphan"> + <key update="true"> + <column name="`epackage_esuperpackage_id`" not-null="false" unique="false"/> + </key> + <list-index column="`epackage_esubpackages_idx`"/> + <one-to-many entity-name="EPackage"/> + </list> + <many-to-one name="eSuperPackage" entity-name="EPackage" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`epackage_esuperpackage_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EParameter" abstract="false" lazy="false" extends="ETypedElement" table="`eparameter`"> + <key> + <column name="`etypedelement_id`"/> + </key> + <many-to-one name="eOperation" entity-name="EOperation" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`eparameter_eoperation_id`"/> + </many-to-one> + </joined-subclass> + <joined-subclass entity-name="EReference" abstract="false" lazy="false" extends="EStructuralFeature" table="`ereference`"> + <key> + <column name="`estructuralfeature_id`"/> + </key> + <property name="containment" type="boolean" lazy="false" column="`containment`" not-null="false"/> + <property name="resolveProxies" type="boolean" lazy="false" column="`resolveproxies`" not-null="false"/> + <many-to-one name="eOpposite" entity-name="EReference" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> + <column not-null="false" unique="false" name="`ereference_eopposite_id`"/> + </many-to-one> + </joined-subclass> + <class entity-name="EStringToStringMapEntry" abstract="false" lazy="false" table="`estringtostringmapentry`"> + <id type="long" name="e_id" column="e_id"> + <generator class="native"/> + </id> + <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> + <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"/> + </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 05dde151a..0e8f22669 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,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 Thu Sep 28 21:19:17 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:01 CEST 2006 --> <hibernate-mapping> <class entity-name="Forum" abstract="false" lazy="false" discriminator-value="Forum" table="`forum`"> <id type="long" name="e_id" column="e_id"> @@ -12,14 +12,14 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`members_id`" not-null="false" unique="false"/> + <column name="`forum_members_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_members_idx`"/> <one-to-many entity-name="Member"/> </list> <list name="topics" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`topics_id`" not-null="false" unique="false"/> + <column name="`forum_topics_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_topics_idx`"/> <one-to-many entity-name="Topic"/> @@ -34,14 +34,14 @@ <property name="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`post_author_id`" not-null="false" unique="false"/> </key> <list-index column="`member_posts_idx`"/> <one-to-many entity-name="Post"/> </list> <list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`creator_id`" not-null="false" unique="false"/> + <column name="`topic_creator_id`" not-null="false" unique="false"/> </key> <list-index column="`member_created_idx`"/> <one-to-many entity-name="Topic"/> @@ -54,11 +54,11 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> - <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <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> - <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`topic_id`"/> + <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_topic_id`"/> </many-to-one> </class> <class entity-name="Topic" abstract="false" lazy="false" discriminator-value="Topic" table="`topic`"> @@ -73,12 +73,12 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> </property> - <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`creator_id`"/> + <many-to-one name="creator" 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="`topic_creator_id`"/> </many-to-one> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`topic_id`" not-null="false" unique="false"/> + <column name="`post_topic_id`" not-null="false" unique="false"/> </key> <list-index column="`topic_posts_idx`"/> <one-to-many entity-name="Post"/> 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 8c8150e51..386a57b36 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,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 Thu Sep 28 21:18:55 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:39 CEST 2006 --> <hibernate-mapping> <class entity-name="Forum" abstract="false" lazy="false" table="`forum`"> <id type="long" name="e_id" column="e_id"> @@ -11,14 +11,14 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="members" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`members_id`" not-null="false" unique="false"/> + <column name="`forum_members_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_members_idx`"/> <one-to-many entity-name="Member"/> </list> <list name="topics" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`topics_id`" not-null="false" unique="false"/> + <column name="`forum_topics_id`" not-null="false" unique="false"/> </key> <list-index column="`forum_topics_idx`"/> <one-to-many entity-name="Topic"/> @@ -32,14 +32,14 @@ <property name="nickname" type="java.lang.String" lazy="false" column="`nickname`" not-null="true"/> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`post_author_id`" not-null="false" unique="false"/> </key> <list-index column="`member_posts_idx`"/> <one-to-many entity-name="Post"/> </list> <list name="created" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`creator_id`" not-null="false" unique="false"/> + <column name="`topic_creator_id`" not-null="false" unique="false"/> </key> <list-index column="`member_created_idx`"/> <one-to-many entity-name="Topic"/> @@ -51,11 +51,11 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="comment" type="java.lang.String" lazy="false" column="`comment`" not-null="true"/> - <many-to-one name="author" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <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> - <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`topic_id`"/> + <many-to-one name="topic" entity-name="Topic" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`post_topic_id`"/> </many-to-one> </class> <class entity-name="Topic" abstract="false" lazy="false" table="`topic`"> @@ -69,12 +69,12 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.forum.TopicCategory</param> </type> </property> - <many-to-one name="creator" entity-name="Member" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`creator_id`"/> + <many-to-one name="creator" 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="`topic_creator_id`"/> </many-to-one> <list name="posts" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`topic_id`" not-null="false" unique="false"/> + <column name="`post_topic_id`" not-null="false" unique="false"/> </key> <list-index column="`topic_posts_idx`"/> <one-to-many entity-name="Post"/> 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 0536f0cad..299153b2d 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,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 Thu Sep 28 21:19:06 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:52 CEST 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" discriminator-value="PType" table="`ptype`"> <id name="id" type="long" column="`id`"> @@ -10,12 +10,12 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`base_id`"/> + <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> <bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`base_id`" not-null="false" unique="false"/> + <column name="`ptype_base_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="PType"/> </bag> 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 df186f4ee..5ee639dff 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,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 Thu Sep 28 21:18:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:28 CEST 2006 --> <hibernate-mapping> <class entity-name="PType" abstract="false" lazy="false" table="`ptype`"> <id name="id" type="long" column="`id`"> @@ -9,12 +9,12 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> - <many-to-one name="base" entity-name="PType" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`base_id`"/> + <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> <bag name="subTypes" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`base_id`" not-null="false" unique="false"/> + <column name="`ptype_base_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="PType"/> </bag> 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 e8df07361..a3da1a03e 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,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 Thu Sep 28 21:18:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:43 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 93f284ed7..41d1c0d14 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,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 Thu Sep 28 21:18:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:18 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 fbccf1e0d..95826c0ae 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,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 Thu Sep 28 21:19:07 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:52 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="myID" column="myID"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`au_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`bo_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`libra`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`wr_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`bo_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`au_id`" not-null="false" unique="false"/> + <column name="`bo_id`" not-null="false" unique="false"/> </key> <list-index column="`w_idx`"/> <one-to-many entity-name="Book"/> 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 1d36db22b..921980e4d 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,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 Thu Sep 28 21:18:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="myID" column="myID"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`au_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`bo_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`libra`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`wr_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`bo_id`" not-null="false" unique="false"/> + <column name="`li_id`" not-null="false" unique="false"/> </key> <list-index column="`l_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`au_id`" not-null="false" unique="false"/> + <column name="`bo_id`" not-null="false" unique="false"/> </key> <list-index column="`w_idx`"/> <one-to-many entity-name="Book"/> 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 61dc65e37..1a97cd35c 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,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 Thu Sep 28 21:19:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:55 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 5ad74d389..fabd853ba 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,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 Thu Sep 28 21:18:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:32 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="false" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 7accc8c46..af965fee0 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,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 Thu Sep 28 21:18:59 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:46 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 821135807..8ec3bf8c3 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,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 Thu Sep 28 21:18:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 4e6ae7c90..d0ddeef7e 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,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 Thu Sep 28 21:19:10 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:54 CEST 2006 --> <hibernate-mapping> <class entity-name="library.Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="library.Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="library.Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="library.Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="library.Book"/> 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 212be7ff4..9d07af39c 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,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 Thu Sep 28 21:18:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:31 CEST 2006 --> <hibernate-mapping> <class entity-name="library.Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`author_id`"/> + <many-to-one name="author" entity-name="library.Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="library.Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="library.Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="library.Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="library.Book"/> 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 4e4cf59d9..823eec5c3 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,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 Thu Sep 28 21:19:11 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:56 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 19db173ca..bddf8b8f7 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,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 Thu Sep 28 21:18:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:33 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 121b4b3e0..716a12eac 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,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 Thu Sep 28 21:19:08 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:53 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 cfb9eaed9..206ff1b51 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,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 Thu Sep 28 21:18:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="delete,merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 e8df07361..981adef6f 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,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 Thu Sep 28 21:18:57 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:42 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -16,8 +16,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`"> @@ -29,14 +29,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -51,7 +51,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 ef6390338..41d1c0d14 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,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 Thu Sep 28 21:18:33 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:18 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -15,8 +15,8 @@ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param> </type> </property> - <many-to-one name="author" 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="`author_id`"/> + <many-to-one name="author" entity-name="Writer" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`book_author_id`"/> </many-to-one> </class> <class entity-name="Library" abstract="false" lazy="false" table="`library`"> @@ -27,14 +27,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`library_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`library_writers_idx`"/> <one-to-many entity-name="Writer"/> </list> <list name="books" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`books_id`" not-null="false" unique="false"/> + <column name="`library_books_id`" not-null="false" unique="false"/> </key> <list-index column="`library_books_idx`"/> <one-to-many entity-name="Book"/> @@ -48,7 +48,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`author_id`" not-null="false" unique="false"/> + <column name="`book_author_id`" not-null="false" unique="false"/> </key> <list-index column="`writer_books_idx`"/> <one-to-many entity-name="Book"/> 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 4add3180a..44420d30e 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 Thu Sep 28 21:19:12 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:56 CEST 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" discriminator-value="ActType" table="`acttype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="scene" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`scene_id`" not-null="false" unique="false"/> + <column name="`acttype_scene_id`" not-null="false" unique="false"/> </key> <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> @@ -27,7 +27,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="true" unique="false"/> + <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> <element type="java.lang.String"/> @@ -41,7 +41,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`personaetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`personaetype_group_idx`"/> <one-to-many entity-name="PersonaeType_group"/> @@ -57,7 +57,7 @@ <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"/> <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="`personagroup_id`"/> + <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> </class> <class entity-name="PersonaGroupType" abstract="false" lazy="false" discriminator-value="PersonaGroupType" table="`personagrouptype`"> @@ -68,7 +68,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persona" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persona_id`" not-null="true" unique="false"/> + <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> <element type="java.lang.String"/> @@ -83,16 +83,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <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="`fm_id`"/> + <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="`personae_id`"/> + <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"/> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`act_id`" not-null="false" unique="false"/> + <column name="`playtype_act_id`" not-null="false" unique="false"/> </key> <list-index column="`playtype_act_idx`"/> <one-to-many entity-name="ActType"/> @@ -106,7 +106,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`scenetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> @@ -123,7 +123,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> <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="`speech_id`"/> + <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> </class> <class entity-name="SpeechType" abstract="false" lazy="false" discriminator-value="SpeechType" table="`speechtype`"> @@ -134,7 +134,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`speechtype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`speechtype_group_idx`"/> <one-to-many entity-name="SpeechType_group"/> 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 67037f666..6b376bc3a 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 Thu Sep 28 21:18:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:33 CEST 2006 --> <hibernate-mapping> <class entity-name="ActType" abstract="false" lazy="false" table="`acttype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="scene" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`scene_id`" not-null="false" unique="false"/> + <column name="`acttype_scene_id`" not-null="false" unique="false"/> </key> <list-index column="`acttype_scene_idx`"/> <one-to-many entity-name="SceneType"/> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="true" unique="false"/> + <column name="`fmtype_p_id`" not-null="true" unique="false"/> </key> <list-index column="`fmtype_p_idx`"/> <element type="java.lang.String"/> @@ -38,7 +38,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`personaetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`personaetype_group_idx`"/> <one-to-many entity-name="PersonaeType_group"/> @@ -54,7 +54,7 @@ <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"/> <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="`personagroup_id`"/> + <column not-null="false" unique="false" name="`personagrouptype_personagroup_id`"/> </many-to-one> </class> <class entity-name="PersonaGroupType" abstract="false" lazy="false" table="`personagrouptype`"> @@ -64,7 +64,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="persona" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`persona_id`" not-null="true" unique="false"/> + <column name="`personagrouptype_persona_id`" not-null="true" unique="false"/> </key> <list-index column="`personagrouptype_persona_idx`"/> <element type="java.lang.String"/> @@ -78,16 +78,16 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <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="`fm_id`"/> + <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="`personae_id`"/> + <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"/> <list name="act" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`act_id`" not-null="false" unique="false"/> + <column name="`playtype_act_id`" not-null="false" unique="false"/> </key> <list-index column="`playtype_act_idx`"/> <one-to-many entity-name="ActType"/> @@ -100,7 +100,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`scenetype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`scenetype_group_idx`"/> <one-to-many entity-name="SceneType_group"/> @@ -117,7 +117,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="stageDirections" type="java.lang.String" lazy="false" column="`stagedirections`" not-null="false"/> <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="`speech_id`"/> + <column not-null="false" unique="false" name="`speechtype_speech_id`"/> </many-to-one> </class> <class entity-name="SpeechType" abstract="false" lazy="false" table="`speechtype`"> @@ -127,7 +127,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`speechtype_group_id`" not-null="false" unique="false"/> </key> <list-index column="`speechtype_group_idx`"/> <one-to-many entity-name="SpeechType_group"/> 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 b3609be87..f9ccbf1b5 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 Thu Sep 28 21:19:15 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:59 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -23,15 +23,15 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="shipTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`usaddress_shipto_id`"/> </many-to-one> <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="`billto_id`"/> + <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"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`items_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> 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 36b86df21..ae91e9712 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 Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id type="long" name="e_id" column="e_id"> @@ -21,15 +21,15 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="shipTo" entity-name="USAddress" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`shipto_id`"/> + <column not-null="false" unique="false" name="`usaddress_shipto_id`"/> </many-to-one> <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="`billto_id`"/> + <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"/> <list name="items" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`items_id`" not-null="false" unique="false"/> + <column name="`purchaseorder_items_id`" not-null="false" unique="false"/> </key> <list-index column="`purchaseorder_items_idx`"/> <one-to-many entity-name="Item"/> 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 450413f8e..6d5a09d2a 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,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 Thu Sep 28 21:19:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:00 CEST 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" discriminator-value="ProductType" table="`producttype`"> <id name="id" type="java.lang.String" column="`id`"/> @@ -9,7 +9,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <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="`supplier_id`"/> + <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"/> 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 6df4f44dd..2b5c9c37d 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,14 +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 Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:37 CEST 2006 --> <hibernate-mapping> <class entity-name="ProductType" abstract="false" lazy="false" table="`producttype`"> <id name="id" type="java.lang.String" column="`id`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <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="`supplier_id`"/> + <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"/> 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 aa18e18ab..b1f1c1149 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,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 Thu Sep 28 21:19:03 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:48 CEST 2006 --> <hibernate-mapping> <class entity-name="AuthorsType" abstract="false" lazy="false" discriminator-value="AuthorsType" table="`authorstype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="authorName" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`authorname_id`" not-null="true" unique="false"/> + <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> <element type="java.lang.String"/> @@ -25,7 +25,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="book" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`book_id`" not-null="false" unique="false"/> + <column name="`bookstype_book_id`" not-null="false" unique="false"/> </key> <list-index column="`bookstype_book_idx`"/> <one-to-many entity-name="BookType"/> @@ -41,11 +41,11 @@ <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"/> <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="`authors_id`"/> + <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"/> <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="`promotion_id`"/> + <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" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`bookcategory`" not-null="false" unique="false"> @@ -62,7 +62,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="books" entity-name="BooksType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`books_id`"/> + <column not-null="true" unique="false" name="`bookstype_books_id`"/> </many-to-one> </class> <class entity-name="PromotionType" abstract="false" lazy="false" discriminator-value="PromotionType" table="`promotiontype`"> 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 d73fb6715..5f25e6fac 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,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 Thu Sep 28 21:18:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:25 CEST 2006 --> <hibernate-mapping> <class entity-name="AuthorsType" abstract="false" lazy="false" table="`authorstype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="authorName" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`authorname_id`" not-null="true" unique="false"/> + <column name="`authorstype_authorname_id`" not-null="true" unique="false"/> </key> <list-index column="`authorstype_authorname_idx`"/> <element type="java.lang.String"/> @@ -23,7 +23,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="book" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`book_id`" not-null="false" unique="false"/> + <column name="`bookstype_book_id`" not-null="false" unique="false"/> </key> <list-index column="`bookstype_book_idx`"/> <one-to-many entity-name="BookType"/> @@ -38,11 +38,11 @@ <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"/> <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="`authors_id`"/> + <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"/> <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="`promotion_id`"/> + <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" access="org.eclipse.emf.teneo.hibernate.mapping.EFeatureAccessor" column="`bookcategory`" not-null="false" unique="false"> @@ -58,7 +58,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="books" entity-name="BooksType" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`books_id`"/> + <column not-null="true" unique="false" name="`bookstype_books_id`"/> </many-to-one> </class> <class entity-name="PromotionType" abstract="false" lazy="false" table="`promotiontype`"> 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 e60f3b110..e0f1d7f71 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 Thu Sep 28 21:19:16 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:00 CEST 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" discriminator-value="WorkflowElement" table="`workflowelement`"> <id type="long" name="e_id" column="e_id"> @@ -19,40 +19,40 @@ <subclass entity-name="Workflow" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Workflow"> <list name="nodes" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`workflownode_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_nodes_idx`"/> <one-to-many entity-name="WorkflowNode"/> </list> <list name="edges" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`edge_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> <list name="comments" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`comment_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_comments_idx`"/> <one-to-many entity-name="Comment"/> </list> </subclass> <subclass entity-name="WorkflowNode" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="WorkflowNode"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`workflownode_workflow_id`"/> </many-to-one> <list name="outputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`outputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_outputs_idx`"/> <one-to-many entity-name="OutputPort"/> </list> <list name="inputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`inputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> @@ -61,36 +61,36 @@ <property name="isFinish" type="boolean" lazy="false" column="`isfinish`" not-null="false"/> </subclass> <subclass entity-name="Edge" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Edge"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_workflow_id`"/> </many-to-one> - <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`target_id`"/> + <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_target_id`"/> </many-to-one> - <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`source_id`"/> + <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_source_id`"/> </many-to-one> </subclass> <subclass entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" discriminator-value="Port"/> <subclass entity-name="InputPort" abstract="false" lazy="false" extends="Port" discriminator-value="InputPort"> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`inputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`target_id`" not-null="false" unique="false"/> + <column name="`edge_target_id`" not-null="false" unique="false"/> </key> <list-index column="`inputport_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> </subclass> <subclass entity-name="OutputPort" abstract="false" lazy="false" extends="Port" discriminator-value="OutputPort"> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`outputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`source_id`" not-null="false" unique="false"/> + <column name="`edge_source_id`" not-null="false" unique="false"/> </key> <list-index column="`outputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -99,7 +99,7 @@ <subclass entity-name="Fault" abstract="false" lazy="false" extends="OutputPort" discriminator-value="Fault"/> <subclass entity-name="CompoundTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="CompoundTask"> <many-to-one name="subworkflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`subworkflow_id`"/> + <column not-null="false" unique="false" name="`workflow_subworkflow_id`"/> </many-to-one> </subclass> <subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="TransformationTask"> @@ -113,8 +113,8 @@ <property name="condition" type="java.lang.String" lazy="false" column="`condition`" not-null="false"/> </subclass> <subclass entity-name="Comment" abstract="false" lazy="false" extends="WorkflowElement" discriminator-value="Comment"> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`comment_workflow_id`"/> </many-to-one> </subclass> <subclass entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" discriminator-value="Task"/> 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 9524228ca..aa53252cb 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 Thu Sep 28 21:18:52 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:48:37 CEST 2006 --> <hibernate-mapping> <class entity-name="WorkflowElement" abstract="true" lazy="false" table="`workflowelement`"> <id type="long" name="e_id" column="e_id"> @@ -21,21 +21,21 @@ </key> <list name="nodes" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`workflownode_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_nodes_idx`"/> <one-to-many entity-name="WorkflowNode"/> </list> <list name="edges" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`edge_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_edges_idx`"/> <one-to-many entity-name="Edge"/> </list> <list name="comments" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`workflow_id`" not-null="false" unique="false"/> + <column name="`comment_workflow_id`" not-null="false" unique="false"/> </key> <list-index column="`workflow_comments_idx`"/> <one-to-many entity-name="Comment"/> @@ -45,19 +45,19 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`workflownode_workflow_id`"/> </many-to-one> <list name="outputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`outputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_outputs_idx`"/> <one-to-many entity-name="OutputPort"/> </list> <list name="inputs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`node_id`" not-null="false" unique="false"/> + <column name="`inputport_node_id`" not-null="false" unique="false"/> </key> <list-index column="`workflownode_inputs_idx`"/> <one-to-many entity-name="InputPort"/> @@ -69,14 +69,14 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_workflow_id`"/> </many-to-one> - <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`target_id`"/> + <many-to-one name="target" entity-name="InputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_target_id`"/> </many-to-one> - <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`source_id`"/> + <many-to-one name="source" entity-name="OutputPort" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`edge_source_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="Port" abstract="true" lazy="false" extends="WorkflowElement" table="`port`"> @@ -88,12 +88,12 @@ <key> <column name="`port_id`"/> </key> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`inputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`target_id`" not-null="false" unique="false"/> + <column name="`edge_target_id`" not-null="false" unique="false"/> </key> <list-index column="`inputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -103,12 +103,12 @@ <key> <column name="`port_id`"/> </key> - <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`node_id`"/> + <many-to-one name="node" entity-name="WorkflowNode" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`outputport_node_id`"/> </many-to-one> <list name="edges" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`source_id`" not-null="false" unique="false"/> + <column name="`edge_source_id`" not-null="false" unique="false"/> </key> <list-index column="`outputport_edges_idx`"/> <one-to-many entity-name="Edge"/> @@ -124,7 +124,7 @@ <column name="`workflownode_id`"/> </key> <many-to-one name="subworkflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`subworkflow_id`"/> + <column not-null="true" unique="false" name="`workflow_subworkflow_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="TransformationTask" abstract="false" lazy="false" extends="WorkflowNode" table="`transformationtask`"> @@ -154,8 +154,8 @@ <key> <column name="`workflowelement_id`"/> </key> - <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`workflow_id`"/> + <many-to-one name="workflow" entity-name="Workflow" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="false" update="false" not-null="false"> + <column not-null="false" unique="false" name="`comment_workflow_id`"/> </many-to-one> </joined-subclass> <joined-subclass entity-name="Task" abstract="false" lazy="false" extends="WorkflowNode" table="`task`"> 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 2f726bc2c..ac056913d 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 Thu Sep 28 21:19:29 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:17 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -12,21 +12,21 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`book_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`book_writers_idx`"/> <one-to-many entity-name="StringToWriterMapEntry"/> </list> <list name="keyWords" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`keywords_id`" not-null="false" unique="false"/> + <column name="`book_keywords_id`" not-null="false" unique="false"/> </key> <list-index column="`book_keywords_idx`"/> <one-to-many entity-name="StringToStringMapEntry"/> </list> <list name="cityByWriter" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`citybywriter_id`" not-null="false" unique="false"/> + <column name="`book_citybywriter_id`" not-null="false" unique="false"/> </key> <list-index column="`book_citybywriter_idx`"/> <one-to-many entity-name="WriterToStringMapEntry"/> @@ -49,7 +49,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> <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="`value_id`"/> + <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> </class> <class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`"> @@ -67,7 +67,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <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="`key_id`"/> + <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"/> </class> 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 5b84a3f55..c5d049527 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 Thu Sep 28 21:19:18 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:02 CEST 2006 --> <hibernate-mapping> <class entity-name="Book" abstract="false" lazy="false" table="`book`"> <id type="long" name="e_id" column="e_id"> @@ -11,21 +11,21 @@ <property name="title" type="java.lang.String" lazy="false" column="`title`" not-null="true"/> <list name="writers" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`writers_id`" not-null="false" unique="false"/> + <column name="`book_writers_id`" not-null="false" unique="false"/> </key> <list-index column="`book_writers_idx`"/> <one-to-many entity-name="StringToWriterMapEntry"/> </list> <list name="keyWords" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`keywords_id`" not-null="false" unique="false"/> + <column name="`book_keywords_id`" not-null="false" unique="false"/> </key> <list-index column="`book_keywords_idx`"/> <one-to-many entity-name="StringToStringMapEntry"/> </list> <list name="cityByWriter" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`citybywriter_id`" not-null="false" unique="false"/> + <column name="`book_citybywriter_id`" not-null="false" unique="false"/> </key> <list-index column="`book_citybywriter_idx`"/> <one-to-many entity-name="WriterToStringMapEntry"/> @@ -46,7 +46,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="key" type="java.lang.String" lazy="false" column="`key`" not-null="false"/> <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="`value_id`"/> + <column not-null="false" unique="false" name="`writer_value_id`"/> </many-to-one> </class> <class entity-name="Writer" abstract="false" lazy="false" table="`writer`"> @@ -62,7 +62,7 @@ </id> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <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="`key_id`"/> + <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"/> </class> 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 b039fab8b..f3c5e998b 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 Thu Sep 28 21:19:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:20 CEST 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" discriminator-value="Element" table="`element`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="nameMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`namemap_id`" not-null="false" unique="false"/> + <column name="`element_namemap_id`" not-null="false" unique="false"/> </key> <list-index column="`element_namemap_idx`"/> <one-to-many entity-name="Element_nameMap"/> @@ -25,7 +25,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="names" entity-name="NameList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`names_id`"/> + <column not-null="false" unique="false" name="`namelist_names_id`"/> </many-to-one> </class> <class entity-name="Feature" abstract="false" lazy="false" discriminator-value="Feature" table="`feature`"> @@ -36,7 +36,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="aMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`amap_id`" not-null="false" unique="false"/> + <column name="`feature_amap_id`" not-null="false" unique="false"/> </key> <list-index column="`feature_amap_idx`"/> <one-to-many entity-name="Feature_aMap"/> @@ -60,7 +60,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`mixed_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`mixed_mixed_idx`"/> <one-to-many entity-name="Mixed_mixed"/> 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 24acb40e4..dd242b0f2 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 Thu Sep 28 21:19:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:05 CEST 2006 --> <hibernate-mapping> <class entity-name="Element" abstract="false" lazy="false" table="`element`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="nameMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`namemap_id`" not-null="false" unique="false"/> + <column name="`element_namemap_id`" not-null="false" unique="false"/> </key> <list-index column="`element_namemap_idx`"/> <one-to-many entity-name="Element_nameMap"/> @@ -24,7 +24,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="names" entity-name="NameList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`names_id`"/> + <column not-null="false" unique="false" name="`namelist_names_id`"/> </many-to-one> </class> <class entity-name="Feature" abstract="false" lazy="false" table="`feature`"> @@ -34,7 +34,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="aMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`amap_id`" not-null="false" unique="false"/> + <column name="`feature_amap_id`" not-null="false" unique="false"/> </key> <list-index column="`feature_amap_idx`"/> <one-to-many entity-name="Feature_aMap"/> @@ -57,7 +57,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`mixed_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`mixed_mixed_idx`"/> <one-to-many entity-name="Mixed_mixed"/> 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 5237863f1..f79af8611 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,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 Thu Sep 28 21:19:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -21,11 +21,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <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="`firstaddress_id`"/> + <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> <list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`secondaddress_id`" not-null="false" unique="false"/> + <column name="`addresslist_secondaddress_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_secondaddress_idx`"/> <one-to-many entity-name="Address"/> @@ -46,7 +46,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`value_id`" not-null="false" unique="false"/> + <column name="`firstaddressholder_value_id`" not-null="false" unique="false"/> </key> <list-index column="`firstaddressholder_value_idx`"/> <one-to-many entity-name="Address"/> 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 7be3ed106..b69bea56b 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,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 Thu Sep 28 21:19:24 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:08 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -19,11 +19,11 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <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="`firstaddress_id`"/> + <column not-null="true" unique="false" name="`firstaddressholder_firstaddress_id`"/> </many-to-one> <list name="secondAddress" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`secondaddress_id`" not-null="false" unique="false"/> + <column name="`addresslist_secondaddress_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_secondaddress_idx`"/> <one-to-many entity-name="Address"/> @@ -49,7 +49,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="value" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`value_id`" not-null="false" unique="false"/> + <column name="`firstaddressholder_value_id`" not-null="false" unique="false"/> </key> <list-index column="`firstaddressholder_value_idx`"/> <one-to-many entity-name="Address"/> 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 ab940d71f..6dd1d7a03 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 Thu Sep 28 21:19:37 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:23 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`address_group_id`" not-null="false" unique="false"/> </key> <list-index column="`address_group_idx`"/> <one-to-many entity-name="Address_group"/> @@ -35,10 +35,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <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="`shipto_id`"/> + <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="`billto_id`"/> + <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"/> </class> @@ -51,7 +51,7 @@ <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <list name="addrs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`addrs_id`" not-null="false" unique="false"/> + <column name="`addresslist_addrs_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_addrs_idx`"/> <one-to-many entity-name="AddressList_addrs"/> @@ -65,10 +65,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`shipto_id`"/> + <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="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> </class> <class entity-name="SimpleAllMapType" abstract="false" lazy="false" discriminator-value="SimpleAllMapType" table="`simpleallmaptype`"> @@ -79,7 +79,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="allMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allmap_id`" not-null="false" unique="false"/> + <column name="`simpleallmaptype_allmap_id`" not-null="false" unique="false"/> </key> <list-index column="`simpleallmaptype_allmap_idx`"/> <one-to-many entity-name="SimpleAllMapType_allMap"/> 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 4ba5aec01..51d188664 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 Thu Sep 28 21:19:25 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:12 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="false" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`address_group_id`" not-null="false" unique="false"/> </key> <list-index column="`address_group_idx`"/> <one-to-many entity-name="Address_group"/> @@ -33,10 +33,10 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <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="`shipto_id`"/> + <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="`billto_id`"/> + <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"/> </class> @@ -48,7 +48,7 @@ <property name="groupName" type="java.lang.String" lazy="false" column="`groupname`" not-null="true"/> <list name="addrs" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`addrs_id`" not-null="false" unique="false"/> + <column name="`addresslist_addrs_id`" not-null="false" unique="false"/> </key> <list-index column="`addresslist_addrs_idx`"/> <one-to-many entity-name="AddressList_addrs"/> @@ -62,10 +62,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`shipto_id`"/> + <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="`billto_id`"/> + <column not-null="false" unique="false" name="`address_billto_id`"/> </many-to-one> </class> <class entity-name="SimpleAllMapType" abstract="false" lazy="false" table="`simpleallmaptype`"> @@ -75,7 +75,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="allMap" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`allmap_id`" not-null="false" unique="false"/> + <column name="`simpleallmaptype_allmap_id`" not-null="false" unique="false"/> </key> <list-index column="`simpleallmaptype_allmap_idx`"/> <one-to-many entity-name="SimpleAllMapType_allMap"/> 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 3b47dee84..3f53f84d6 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,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 Thu Sep 28 21:19:34 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:19 CEST 2006 --> <hibernate-mapping> <class entity-name="statesByCountry" abstract="false" lazy="false" discriminator-value="statesByCountry" table="`statesbycountry`"> <id type="long" name="e_id" column="e_id"> @@ -13,14 +13,14 @@ <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="`allstates_id`" not-null="true" unique="false"/> + <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="`siximportantstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_siximportantstates_idx`"/> <element type="java.lang.String"/> 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 932d50b3e..0b4251c22 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,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 Thu Sep 28 21:19:21 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:04 CEST 2006 --> <hibernate-mapping> <class entity-name="statesByCountry" abstract="false" lazy="false" table="`statesbycountry`"> <id type="long" name="e_id" column="e_id"> @@ -12,14 +12,14 @@ <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="`allstates_id`" not-null="true" unique="false"/> + <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="`siximportantstates_id`" not-null="true" unique="false"/> + <column name="`statesbycountry_siximportantstates_id`" not-null="true" unique="false"/> </key> <list-index column="`statesbycountry_siximportantstates_idx`"/> <element type="java.lang.String"/> 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 71c5ad841..738de630f 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 Thu Sep 28 21:19:35 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:21 CEST 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" discriminator-value="LetterBodyType" table="`letterbodytype`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`letterbodytype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`letterbodytype_mixed_idx`"/> <one-to-many entity-name="LetterBodyType_mixed"/> @@ -25,7 +25,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`salutation_id`"/> + <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"/> @@ -42,7 +42,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`salutationtype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`salutationtype_mixed_idx`"/> <one-to-many entity-name="SalutationType_mixed"/> 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 495c25f17..1a776deb4 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 Thu Sep 28 21:19:22 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:06 CEST 2006 --> <hibernate-mapping> <class entity-name="LetterBodyType" abstract="false" lazy="false" table="`letterbodytype`"> <id type="long" name="e_id" column="e_id"> @@ -10,7 +10,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`letterbodytype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`letterbodytype_mixed_idx`"/> <one-to-many entity-name="LetterBodyType_mixed"/> @@ -24,7 +24,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`salutation_id`"/> + <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"/> @@ -40,7 +40,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`salutationtype_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`salutationtype_mixed_idx`"/> <one-to-many entity-name="SalutationType_mixed"/> 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 9e361ec47..cef0ca0fa 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 Thu Sep 28 21:19:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:24 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" discriminator-value="A" table="`a`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`a_group_id`" not-null="false" unique="false"/> </key> <list-index column="`a_group_idx`"/> <one-to-many entity-name="A_group"/> @@ -27,7 +27,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> <class entity-name="CType" abstract="false" lazy="false" discriminator-value="CType" table="`ctype`"> @@ -47,7 +47,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`element_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`element_mixed_idx`"/> <one-to-many entity-name="Element_mixed"/> @@ -63,16 +63,16 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`true_id`" not-null="false" unique="false"/> + <column name="`element_true_id`" not-null="false" unique="false"/> </key> <list-index column="`element_true_idx`"/> <one-to-many entity-name="Element_true"/> </list> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> <many-to-one name="recursive" entity-name="Element" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`recursive_id`"/> + <column not-null="false" unique="false" name="`element_recursive_id`"/> </many-to-one> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> @@ -86,7 +86,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </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.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 e2841597c..bb6b9f13c 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 Thu Sep 28 21:19:26 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:13 CEST 2006 --> <hibernate-mapping> <class entity-name="A" abstract="false" lazy="false" table="`a`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="group" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`group_id`" not-null="false" unique="false"/> + <column name="`a_group_id`" not-null="false" unique="false"/> </key> <list-index column="`a_group_idx`"/> <one-to-many entity-name="A_group"/> @@ -26,7 +26,7 @@ <property name="fme_feature" type="java.lang.String"/> <property name="b" type="java.lang.String" lazy="false" column="`b`" not-null="false"/> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </class> <class entity-name="CType" abstract="false" lazy="false" table="`ctype`"> @@ -44,7 +44,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="mixed" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mixed_id`" not-null="false" unique="false"/> + <column name="`element_mixed_id`" not-null="false" unique="false"/> </key> <list-index column="`element_mixed_idx`"/> <one-to-many entity-name="Element_mixed"/> @@ -60,16 +60,16 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="false"/> <list name="true" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`true_id`" not-null="false" unique="false"/> + <column name="`element_true_id`" not-null="false" unique="false"/> </key> <list-index column="`element_true_idx`"/> <one-to-many entity-name="Element_true"/> </list> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> <many-to-one name="recursive" entity-name="Element" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`recursive_id`"/> + <column not-null="false" unique="false" name="`element_recursive_id`"/> </many-to-one> <property name="fme_mixed_text" type="java.lang.String"/> <property name="fme_mixed_cdata" type="java.lang.String"/> @@ -83,7 +83,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <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="`c_id`"/> + <column not-null="false" unique="false" name="`ctype_c_id`"/> </many-to-one> </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.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 545235b1b..4dd95d253 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 Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:22 CEST 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" discriminator-value="XMLDeviant" table="`xmldeviant`"> <id type="long" name="e_id" column="e_id"> 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 a51fc8f1f..daef74e03 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 Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="XMLDeviant" abstract="false" lazy="false" table="`xmldeviant`"> <id type="long" name="e_id" column="e_id"> 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 2fd4176ff..2067d4b9c 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,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 Thu Sep 28 21:19:31 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:17 CEST 2006 --> <hibernate-mapping> <class entity-name="SimpleList" abstract="false" lazy="false" discriminator-value="SimpleList" table="`simplelist`"> <id type="long" name="e_id" column="e_id"> @@ -12,35 +12,35 @@ <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`boo_id`" not-null="true" unique="false"/> + <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> <element type="boolean"/> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`byt_id`" not-null="true" unique="false"/> + <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> <element type="java.lang.Byte"/> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`doubl_id`" not-null="true" unique="false"/> + <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> <element type="java.lang.Double"/> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`floa_id`" not-null="true" unique="false"/> + <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> <element type="java.lang.Float"/> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`inte_id`" not-null="true" unique="false"/> + <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> <element type="java.lang.Integer"/> @@ -52,49 +52,49 @@ </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`shor_id`" not-null="true" unique="false"/> + <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> <element type="short"/> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`dat_id`" not-null="true" unique="false"/> + <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> <element type="java.util.Date"/> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`limitedstring_id`" not-null="true" unique="false"/> + <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> <element type="java.lang.String"/> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`intarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> <element type="int"/> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`doublearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> <element type="double"/> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`stringarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> <element type="java.lang.String"/> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`bytearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> <element type="byte"/> 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 d4558bbbe..6e3d2ca2e 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,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 Thu Sep 28 21:19:19 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:02 CEST 2006 --> <hibernate-mapping> <class entity-name="SimpleList" abstract="false" lazy="false" table="`simplelist`"> <id type="long" name="e_id" column="e_id"> @@ -11,35 +11,35 @@ <property name="code" type="java.lang.String" lazy="false" column="`code`" not-null="false"/> <list name="boo" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`boo_id`" not-null="true" unique="false"/> + <column name="`simplelist_boo_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_boo_idx`"/> <element type="boolean"/> </list> <list name="byt" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`byt_id`" not-null="true" unique="false"/> + <column name="`simplelist_byt_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_byt_idx`"/> <element type="java.lang.Byte"/> </list> <list name="doubl" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`doubl_id`" not-null="true" unique="false"/> + <column name="`simplelist_doubl_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doubl_idx`"/> <element type="java.lang.Double"/> </list> <list name="floa" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`floa_id`" not-null="true" unique="false"/> + <column name="`simplelist_floa_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_floa_idx`"/> <element type="java.lang.Float"/> </list> <list name="inte" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`inte_id`" not-null="true" unique="false"/> + <column name="`simplelist_inte_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_inte_idx`"/> <element type="java.lang.Integer"/> @@ -51,49 +51,49 @@ </list> <list name="shor" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`shor_id`" not-null="true" unique="false"/> + <column name="`simplelist_shor_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_shor_idx`"/> <element type="short"/> </list> <list name="dat" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`dat_id`" not-null="true" unique="false"/> + <column name="`simplelist_dat_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_dat_idx`"/> <element type="java.util.Date"/> </list> <list name="limitedstring" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`limitedstring_id`" not-null="true" unique="false"/> + <column name="`simplelist_limitedstring_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_limitedstring_idx`"/> <element type="java.lang.String"/> </list> <array name="intArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`intarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_intarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_intarray_idx`"/> <element type="int"/> </array> <array name="doubleArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`doublearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_doublearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_doublearray_idx`"/> <element type="double"/> </array> <array name="stringArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`stringarray_id`" not-null="true" unique="false"/> + <column name="`simplelist_stringarray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_stringarray_idx`"/> <element type="java.lang.String"/> </array> <array name="byteArray" cascade="all,delete-orphan"> <key update="true"> - <column name="`bytearray_id`" not-null="true" unique="false"/> + <column name="`simplelist_bytearray_id`" not-null="true" unique="false"/> </key> <list-index column="`simplelist_bytearray_idx`"/> <element type="byte"/> 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 5958d01ff..7acf6f2ae 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 Thu Sep 28 21:19:36 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:21 CEST 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" discriminator-value="PurchaseOrder" table="`purchaseorder`"> <id type="long" name="e_id" column="e_id"> @@ -20,7 +20,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="Supplier_orders"/> @@ -34,10 +34,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="preferredOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`preferredorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_preferredorders_id`"/> </many-to-one> <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="`standardorders_id`"/> + <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"/> 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 9d86740ab..b17c3706e 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 Thu Sep 28 21:19:23 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:07 CEST 2006 --> <hibernate-mapping> <class entity-name="PurchaseOrder" abstract="false" lazy="false" table="`purchaseorder`"> <id type="long" name="e_id" column="e_id"> @@ -18,7 +18,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="orders" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`orders_id`" not-null="false" unique="false"/> + <column name="`supplier_orders_id`" not-null="false" unique="false"/> </key> <list-index column="`supplier_orders_idx`"/> <one-to-many entity-name="Supplier_orders"/> @@ -32,10 +32,10 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="preferredOrders" entity-name="PurchaseOrder" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`preferredorders_id`"/> + <column not-null="false" unique="false" name="`purchaseorder_preferredorders_id`"/> </many-to-one> <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="`standardorders_id`"/> + <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"/> 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 8b763ec36..9da8fee2a 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 Thu Sep 28 21:19:40 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:27 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" discriminator-value="ComplexNumber" table="`complexnumber`"> <id type="long" name="e_id" column="e_id"> @@ -22,7 +22,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/> @@ -36,7 +36,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <class entity-name="NumberType" abstract="false" lazy="false" discriminator-value="NumberType" table="`numbertype`"> @@ -48,14 +48,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mysimpleabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mysimpleabstractgroup_idx`"/> <one-to-many entity-name="NumberType_mySimpleAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="NumberType_myComplexAbstractGroup"/> @@ -78,7 +78,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <subclass entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" discriminator-value="OddComplexNumberType"/> 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 650485934..b17acc8f5 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 Thu Sep 28 21:19:28 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:15 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexNumber" abstract="false" lazy="false" table="`complexnumber`"> <id type="long" name="e_id" column="e_id"> @@ -24,7 +24,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`multinumbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`multinumbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="MultiNumberType_myComplexAbstractGroup"/> @@ -38,7 +38,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <class entity-name="NumberType" abstract="false" lazy="false" table="`numbertype`"> @@ -49,14 +49,14 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="mySimpleAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mysimpleabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mysimpleabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mysimpleabstractgroup_idx`"/> <one-to-many entity-name="NumberType_mySimpleAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`numbertype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`numbertype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="NumberType_myComplexAbstractGroup"/> @@ -79,7 +79,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexNumber" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexnumber_mycomplexabstract_id`"/> </many-to-one> </class> <joined-subclass entity-name="OddComplexNumberType" abstract="false" lazy="false" extends="ComplexNumber" table="`oddcomplexnumbertype`"> 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 fb5205035..5449c007a 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 Thu Sep 28 21:19:39 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:26 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" discriminator-value="ComplexAAA" table="`complexaaa`"> <id type="long" name="e_id" column="e_id"> @@ -21,14 +21,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="myAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`myabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_myabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_myabstractgroup_idx`"/> <one-to-many entity-name="RootType_myAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="RootType_myComplexAbstractGroup"/> @@ -51,7 +51,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexAAA" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexaaa_mycomplexabstract_id`"/> </many-to-one> </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.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 3bb624cff..b5be2d031 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 Thu Sep 28 21:19:27 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:14 CEST 2006 --> <hibernate-mapping> <class entity-name="ComplexAAA" abstract="false" lazy="false" table="`complexaaa`"> <id type="long" name="e_id" column="e_id"> @@ -27,14 +27,14 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="myAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`myabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_myabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_myabstractgroup_idx`"/> <one-to-many entity-name="RootType_myAbstractGroup"/> </list> <list name="myComplexAbstractGroup" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`mycomplexabstractgroup_id`" not-null="false" unique="false"/> + <column name="`roottype_mycomplexabstractgroup_id`" not-null="false" unique="false"/> </key> <list-index column="`roottype_mycomplexabstractgroup_idx`"/> <one-to-many entity-name="RootType_myComplexAbstractGroup"/> @@ -57,7 +57,7 @@ <version name="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <property name="fme_feature" type="java.lang.String"/> <many-to-one name="myComplexAbstract" entity-name="ComplexAAA" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mycomplexabstract_id`"/> + <column not-null="false" unique="false" name="`complexaaa_mycomplexabstract_id`"/> </many-to-one> </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.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 e4b255fd2..6ee82e73b 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 Thu Sep 28 21:19:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -12,7 +12,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`country_id`" not-null="false" unique="false"/> + <column name="`address_country_id`" not-null="false" unique="false"/> </key> <list-index column="`address_country_idx`"/> <one-to-many entity-name="City"/> @@ -27,7 +27,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`city_address_id`" not-null="false" unique="false"/> </key> <list-index column="`city_address_idx`"/> <one-to-many entity-name="Address"/> @@ -42,7 +42,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`person_address_id`" not-null="false" unique="false"/> </key> <list-index column="`person_address_idx`"/> <one-to-many entity-name="Address"/> 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 8661f69cf..f6fc999b4 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 Thu Sep 28 21:19:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> @@ -11,7 +11,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="country" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`country_id`" not-null="false" unique="false"/> + <column name="`address_country_id`" not-null="false" unique="false"/> </key> <list-index column="`address_country_idx`"/> <one-to-many entity-name="City"/> @@ -25,7 +25,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`city_address_id`" not-null="false" unique="false"/> </key> <list-index column="`city_address_idx`"/> <one-to-many entity-name="Address"/> @@ -39,7 +39,7 @@ <property name="name" type="java.lang.String" lazy="false" column="`name`" not-null="true"/> <list name="address" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`address_id`" not-null="false" unique="false"/> + <column name="`person_address_id`" not-null="false" unique="false"/> </key> <list-index column="`person_address_idx`"/> <one-to-many entity-name="Address"/> 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 9dc087a1d..ab4cd0277 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,17 +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 Thu Sep 28 21:19:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" discriminator-value="Person" table="`person`"> <id name="name" type="java.lang.String" column="`name`"/> <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="father" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`father_name`"/> + <column not-null="false" unique="false" name="`person_father_name`"/> </many-to-one> <many-to-one name="mother" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mother_name`"/> + <column not-null="false" unique="false" name="`person_mother_name`"/> </many-to-one> <bag name="children" table="person_person" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key/> 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 987a96e2c..45ed01e92 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,16 +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 Thu Sep 28 21:19:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Person" abstract="false" lazy="false" table="`person`"> <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="father" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`father_name`"/> + <column not-null="false" unique="false" name="`person_father_name`"/> </many-to-one> <many-to-one name="mother" entity-name="Person" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mother_name`"/> + <column not-null="false" unique="false" name="`person_mother_name`"/> </many-to-one> <bag name="children" table="person_person" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key/> 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 bd31cef26..a0d414cd4 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,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 Thu Sep 28 21:19:48 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:35 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" discriminator-value="Item" table="`item`"> <id name="itemType" column="`itemtype`"> 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 965cbe88b..2bae7c518 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,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 Thu Sep 28 21:19:43 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:30 CEST 2006 --> <hibernate-mapping> <class entity-name="Item" abstract="false" lazy="false" table="`item`"> <id name="itemType" column="`itemtype`"> 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 116619135..8c25a053b 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,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 Thu Sep 28 21:19:46 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" discriminator-value="Thing" table="`thing`"> <id name="name" type="java.lang.String" column="`name`"/> @@ -9,7 +9,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`things_name`" not-null="false" unique="false"/> + <column name="`thing_things_name`" not-null="false" unique="false"/> </key> <list-index column="`thing_things_idx`"/> <one-to-many entity-name="SubThing"/> 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 a61f26996..54401f62a 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,14 +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 Thu Sep 28 21:19:41 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:28 CEST 2006 --> <hibernate-mapping> <class entity-name="Thing" abstract="false" lazy="false" table="`thing`"> <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <list name="things" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> - <column name="`things_name`" not-null="false" unique="false"/> + <column name="`thing_things_name`" not-null="false" unique="false"/> </key> <list-index column="`thing_things_idx`"/> <one-to-many entity-name="SubThing"/> 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 193b4e9d6..2b072a362 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 Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" discriminator-value="Address" table="`address`"> <id type="long" name="e_id" column="e_id"> 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 671abb8d1..4e9096ffc 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 Thu Sep 28 21:19:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Address" abstract="true" lazy="false" table="`address`"> <id type="long" name="e_id" column="e_id"> 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 9ef25ffbf..b3b712391 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,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 Thu Sep 28 21:19:47 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:34 CEST 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" discriminator-value="Head" table="`head`"> <id name="hair" type="java.lang.String" column="`hair`"/> @@ -13,7 +13,7 @@ <discriminator column="`dtype`" type="string"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="head" entity-name="Head" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`head_hair`"/> + <column not-null="false" unique="false" name="`head_head_hair`"/> </many-to-one> </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.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 ab3692790..b03524f77 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,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 Thu Sep 28 21:19:42 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:29 CEST 2006 --> <hibernate-mapping> <class entity-name="Head" abstract="false" lazy="false" table="`head`"> <id name="hair" type="java.lang.String" column="`hair`"/> @@ -11,7 +11,7 @@ <id name="name" type="java.lang.String" column="`name`"/> <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"/> <many-to-one name="head" entity-name="Head" cascade="merge,persist,save-update,lock,refresh" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`head_hair`"/> + <column not-null="false" unique="false" name="`head_head_hair`"/> </many-to-one> </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.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 9890995f6..08ff9fd1a 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 Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:36 CEST 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" discriminator-value="Me" table="`me`"> <id type="long" name="e_id" column="e_id"> 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 6b441f56f..fd2a35591 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 Thu Sep 28 21:19:44 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:31 CEST 2006 --> <hibernate-mapping> <class entity-name="Me" abstract="false" lazy="false" table="`me`"> <id type="long" name="e_id" column="e_id"> 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 1d549b493..1bf3a5f2c 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 Thu Sep 28 21:19:49 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:37 CEST 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" discriminator-value="AbstractSuper" table="`abstractsuper`"> <id type="long" name="e_id" column="e_id"> @@ -25,7 +25,7 @@ <subclass entity-name="MList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="MList"> <list name="m" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`m_id`" not-null="false" unique="false"/> + <column name="`mlist_m_id`" not-null="false" unique="false"/> </key> <list-index column="`mlist_m_idx`"/> <one-to-many entity-name="M"/> @@ -45,7 +45,7 @@ <subclass entity-name="PList" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="PList"> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="false" unique="false"/> + <column name="`plist_p_id`" not-null="false" unique="false"/> </key> <list-index column="`plist_p_idx`"/> <one-to-many entity-name="P"/> @@ -53,10 +53,10 @@ </subclass> <subclass entity-name="R" abstract="false" lazy="false" extends="AbstractSuper" discriminator-value="R"> <many-to-one name="plist" entity-name="PList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`plist_id`"/> + <column not-null="false" unique="false" name="`plist_plist_id`"/> </many-to-one> <many-to-one name="mlist" entity-name="MList" cascade="all" lazy="false" insert="true" update="true" not-null="false"> - <column not-null="false" unique="false" name="`mlist_id`"/> + <column not-null="false" unique="false" name="`mlist_mlist_id`"/> </many-to-one> </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.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 a2a61bed8..762613490 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 Thu Sep 28 21:19:45 CEST 2006 --> +<!-- Generated by Teneo on Fri Sep 29 13:49:32 CEST 2006 --> <hibernate-mapping> <class entity-name="AbstractSuper" abstract="false" lazy="false" table="`abstractsuper`"> <id type="long" name="e_id" column="e_id"> @@ -30,7 +30,7 @@ </key> <list name="m" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`m_id`" not-null="false" unique="false"/> + <column name="`mlist_m_id`" not-null="false" unique="false"/> </key> <list-index column="`mlist_m_idx`"/> <one-to-many entity-name="M"/> @@ -56,7 +56,7 @@ </key> <list name="p" lazy="true" cascade="all,delete-orphan"> <key update="true"> - <column name="`p_id`" not-null="false" unique="false"/> + <column name="`plist_p_id`" not-null="false" unique="false"/> </key> <list-index column="`plist_p_idx`"/> <one-to-many entity-name="P"/> @@ -67,10 +67,10 @@ <column name="`abstractsuper_id`"/> </key> <many-to-one name="plist" entity-name="PList" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`plist_id`"/> + <column not-null="true" unique="false" name="`plist_plist_id`"/> </many-to-one> <many-to-one name="mlist" entity-name="MList" cascade="all" lazy="false" insert="true" update="true" not-null="true"> - <column not-null="true" unique="false" name="`mlist_id`"/> + <column not-null="true" unique="false" name="`mlist_mlist_id`"/> </many-to-one> </joined-subclass> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java index a2bdc6fe3..af1a2f818 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/HibernateTestbed.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HibernateTestbed.java,v 1.8 2006/09/29 05:14:23 mtaal Exp $ + * $Id: HibernateTestbed.java,v 1.9 2006/09/29 12:30:24 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test; @@ -38,7 +38,7 @@ import org.eclipse.emf.teneo.test.stores.TestStore; * Is the testbed which models the base in which a testrun is run. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.8 $ + * @version $Revision: 1.9 $ */ public class HibernateTestbed extends Testbed { @@ -61,7 +61,6 @@ public class HibernateTestbed extends Testbed { } else { propFileName = "/local_test.properties"; } - System.err.println("Property File " + propFileName); Testbed.setTestBed(new HibernateTestbed()); } catch (Exception e) { throw new StoreTestException("Exception while checking directory " + RUN_BASE_DIR, e); 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 e9bc3e1fa..f62f4b070 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.15 2006/09/28 20:05:52 mtaal Exp $ + * $Id: AllTests.java,v 1.16 2006/09/29 12:30:24 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.emf.annotations; @@ -51,13 +51,15 @@ import org.eclipse.emf.teneo.test.emf.annotations.UniqueConstraintsAction; * All tests * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.15 $ + * @version $Revision: 1.16 $ */ 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(DuplicatesAction.class); + suite.addTestSuite(UniqueConstraintsAction.class); suite.addTestSuite(InheritanceAnnotationAction.class); suite.addTestSuite(LazyLibraryAction.class); @@ -87,7 +89,6 @@ public class AllTests { suite.addTestSuite(BasicAction.class); suite.addTestSuite(CascadeNotallAction.class); - suite.addTestSuite(UniqueConstraintsAction.class); suite.addTestSuite(CompositeIdAction.class); suite.addTestSuite(PKeyJoinAction.class); @@ -95,7 +96,6 @@ public class AllTests { suite.addTestSuite(SetResourceAction.class); suite.addTestSuite(SetNMAction.class); - suite.addTestSuite(DuplicatesAction.class); suite.addTestSuite(AttributeOverridesAction.class); suite.addTestSuite(LobAction.class); suite.addTestSuite(EmbeddedIdAction.class); diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java index 9c9492dc9..658d8f0ea 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: AllTests.java,v 1.11 2006/09/22 13:58:14 mtaal Exp $ + * $Id: AllTests.java,v 1.12 2006/09/29 12:30:23 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.emf.sample; @@ -43,13 +43,15 @@ import org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction; * All sample tests * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ public class AllTests { public static Test suite() { TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.sample", HibernateTestbed.instance() .getConfigurations()); + //suite.addTestSuite(EcoreAction.class); + suite.addTestSuite(DynamicAction.class); suite.addTestSuite(LibrarySerializationAction.class); @@ -82,7 +84,6 @@ public class AllTests { suite.addTestSuite(ProductAction.class); suite.addTestSuite(WorkFlowAction.class); suite.addTestSuite(ForumAction.class); - return suite; } } diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java index 3320a8e83..bc5c10e43 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java +++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/stores/HibernateTestStore.java @@ -11,7 +11,7 @@ * Martin Taal * </copyright> * - * $Id: HibernateTestStore.java,v 1.5 2006/09/08 04:35:42 mtaal Exp $ + * $Id: HibernateTestStore.java,v 1.6 2006/09/29 12:30:23 mtaal Exp $ */ package org.eclipse.emf.teneo.hibernate.test.stores; @@ -54,7 +54,7 @@ import org.hibernate.persister.entity.SingleTableEntityPersister; * The hibernate test store encapsulates the datastore actions to a hibernate store. * * @author <a href="mailto:mtaal@elver.org">Martin Taal</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public class HibernateTestStore extends AbstractTestStore { /** The logger */ @@ -201,7 +201,7 @@ public class HibernateTestStore extends AbstractTestStore { /** Store/Makepersistent */ public void store(Object object) { - session.persist(object); + session.saveOrUpdate(object); } /** Deletes an object */ |