diff options
author | mtaal | 2009-03-07 21:13:34 +0000 |
---|---|---|
committer | mtaal | 2009-03-07 21:13:34 +0000 |
commit | b9e557addff286e91aa7a6b1d25dc1b9ea848374 (patch) | |
tree | 2194ca802ffd9865a634571fd4f2be62c985387c | |
parent | 75b9489fabdde7684275780bafbbf1bf07d51ea9 (diff) | |
download | org.eclipse.emf.teneo-b9e557addff286e91aa7a6b1d25dc1b9ea848374.tar.gz org.eclipse.emf.teneo-b9e557addff286e91aa7a6b1d25dc1b9ea848374.tar.xz org.eclipse.emf.teneo-b9e557addff286e91aa7a6b1d25dc1b9ea848374.zip |
[267510]
9 files changed, 24 insertions, 39 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml index 6b6271675..6563191eb 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_a_o_hibernate.hbm.xml @@ -22,12 +22,9 @@ <generator class="native"/> </id> <discriminator column="`dtype`" type="string"/> - <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> - <meta attribute="syntheticVersion">true</meta> - </version> - <property name="generated" lazy="false" insert="false" update="false" not-null="true" unique="false" type="long" generated="always"> + <version name="generated" type="long"> <column not-null="true" unique="false" name="`generated`"/> - </property> + </version> </class> <class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" discriminator-value="TableID" table="`tableid`"> <meta attribute="eclassName">TableID</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml index bc9d3f192..ad4ed680f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_e_o_hibernate.hbm.xml @@ -20,12 +20,9 @@ <column not-null="false" unique="false" name="`autod`"/> <generator class="native"/> </id> - <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> - <meta attribute="syntheticVersion">true</meta> - </version> - <property name="generated" lazy="false" insert="false" update="false" not-null="true" unique="false" type="long" generated="always"> + <version name="generated" type="long"> <column not-null="true" unique="false" name="`generated`"/> - </property> + </version> </class> <class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`"> <meta attribute="eclassName">TableID</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml index bc9d3f192..ad4ed680f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/HbSequenceIdAction_mysql_s_o_hibernate.hbm.xml @@ -20,12 +20,9 @@ <column not-null="false" unique="false" name="`autod`"/> <generator class="native"/> </id> - <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> - <meta attribute="syntheticVersion">true</meta> - </version> - <property name="generated" lazy="false" insert="false" update="false" not-null="true" unique="false" type="long" generated="always"> + <version name="generated" type="long"> <column not-null="true" unique="false" name="`generated`"/> - </property> + </version> </class> <class name="org.eclipse.emf.teneo.samples.emf.annotations.hb.generator.id.impl.TableIDImpl" entity-name="TableID" abstract="false" lazy="false" table="`tableid`"> <meta attribute="eclassName">TableID</meta> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml index ae4e46bd2..81f8a2b6f 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_a_o_hibernate.hbm.xml @@ -55,19 +55,17 @@ </key> <one-to-many entity-name="ContainedItem"/> </bag> - <bag name="item" order-by="name" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`item_itemlist_e_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> - <bag name="joinedItem" table="`itemlist_item`" lazy="true" cascade="merge,persist,save-update,lock,refresh"> - <key update="true"> - <column name="`itemlist_e_id`" not-null="true" unique="false"/> + <bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true" foreign-key="itemlist_joineditem"> + <column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/> </key> - <many-to-many entity-name="Item" unique="false" foreign-key="itemlist_joineditem"> - <column name="`item_e_id`" not-null="true" unique="false"/> - </many-to-many> + <one-to-many entity-name="Item"/> </bag> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml index 39ebef862..e128fa42b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_e_o_hibernate.hbm.xml @@ -52,19 +52,17 @@ </key> <one-to-many entity-name="ContainedItem"/> </bag> - <bag name="item" order-by="name" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`item_itemlist_e_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> - <bag name="joinedItem" table="`itemlist_item`" lazy="true" cascade="merge,persist,save-update,lock,refresh"> - <key update="true"> - <column name="`itemlist_e_id`" not-null="true" unique="false"/> + <bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true" foreign-key="itemlist_joineditem"> + <column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/> </key> - <many-to-many entity-name="Item" unique="false" foreign-key="itemlist_joineditem"> - <column name="`item_e_id`" not-null="true" unique="false"/> - </many-to-many> + <one-to-many entity-name="Item"/> </bag> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml index 39ebef862..e128fa42b 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/SetResourceAction_mysql_s_o_hibernate.hbm.xml @@ -52,19 +52,17 @@ </key> <one-to-many entity-name="ContainedItem"/> </bag> - <bag name="item" order-by="name" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="item" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true"> <column name="`item_itemlist_e_id`" not-null="false" unique="false"/> </key> <one-to-many entity-name="Item"/> </bag> - <bag name="joinedItem" table="`itemlist_item`" lazy="true" cascade="merge,persist,save-update,lock,refresh"> - <key update="true"> - <column name="`itemlist_e_id`" not-null="true" unique="false"/> + <bag name="joinedItem" order-by="`name` desc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <key update="true" foreign-key="itemlist_joineditem"> + <column name="`itemlist_joineditem_e_id`" not-null="false" unique="false"/> </key> - <many-to-many entity-name="Item" unique="false" foreign-key="itemlist_joineditem"> - <column name="`item_e_id`" not-null="true" unique="false"/> - </many-to-many> + <one-to-many entity-name="Item"/> </bag> </class> </hibernate-mapping>
\ No newline at end of file diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml index 35137a051..2584c1d72 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_a_o_hibernate.hbm.xml @@ -13,7 +13,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <bag name="manies" order-by="myname asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true" foreign-key="one_manies"> <column name="`one_manies_e_id`" not-null="false" unique="false"/> </key> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml index 523aff914..a9e00f601 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_e_o_hibernate.hbm.xml @@ -12,7 +12,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <bag name="manies" order-by="myname asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true" foreign-key="one_manies"> <column name="`one_manies_e_id`" not-null="false" unique="false"/> </key> diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml index 523aff914..a9e00f601 100644 --- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml +++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237498Action_mysql_s_o_hibernate.hbm.xml @@ -12,7 +12,7 @@ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler"> <meta attribute="syntheticVersion">true</meta> </version> - <bag name="manies" order-by="myname asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> + <bag name="manies" order-by="`myname` asc" lazy="true" cascade="merge,persist,save-update,lock,refresh"> <key update="true" foreign-key="one_manies"> <column name="`one_manies_e_id`" not-null="false" unique="false"/> </key> |