Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2012-11-02 17:38:21 +0000
committerMartin Taal2012-11-02 17:38:21 +0000
commit5c5a70060dd7a9e4a5815ff710081b4ecaebf026 (patch)
treeadec86a2273a8020d146ef9857145850c14a8dee /tests/org.eclipse.emf.teneo.hibernate.test/hbm
parentb8a50344b372a4016afbef528b546dabee28c268 (diff)
downloadorg.eclipse.emf.teneo-5c5a70060dd7a9e4a5815ff710081b4ecaebf026.tar.gz
org.eclipse.emf.teneo-5c5a70060dd7a9e4a5815ff710081b4ecaebf026.tar.xz
org.eclipse.emf.teneo-5c5a70060dd7a9e4a5815ff710081b4ecaebf026.zip
added auditing support for emap
Diffstat (limited to 'tests/org.eclipse.emf.teneo.hibernate.test/hbm')
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml74
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml78
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml74
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml78
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml74
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml78
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_e_o_hibernate.hbm.xml60
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_h_o_hibernate.hbm.xml68
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml60
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml68
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz363777Action_hsqldb_h_o_hibernate.hbm.xml7
11 files changed, 335 insertions, 384 deletions
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
index c0ac8b69c..088909e3b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -220,45 +220,37 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -276,7 +268,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -296,8 +288,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -346,8 +341,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -365,7 +360,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -385,11 +380,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 1bda0ee7d..6a5974a77 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -238,52 +238,44 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -297,7 +289,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -317,8 +309,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToPartMapEntryAuditing" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -370,15 +365,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -392,7 +387,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -412,11 +407,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
index c0ac8b69c..088909e3b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_e_o_hibernate.hbm.xml
@@ -220,45 +220,37 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -276,7 +268,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -296,8 +288,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -346,8 +341,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -365,7 +360,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -385,11 +380,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
index 1bda0ee7d..6a5974a77 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyJoinColumnAction_hsqldb_h_o_hibernate.hbm.xml
@@ -238,52 +238,44 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -297,7 +289,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -317,8 +309,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToPartMapEntryAuditing" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -370,15 +365,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -392,7 +387,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -412,11 +407,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
index c0ac8b69c..088909e3b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_e_o_hibernate.hbm.xml
@@ -220,45 +220,37 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -276,7 +268,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -296,8 +288,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -346,8 +341,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -365,7 +360,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -385,11 +380,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
index 1bda0ee7d..6a5974a77 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/MapKeyTypesAction_hsqldb_h_o_hibernate.hbm.xml
@@ -238,52 +238,44 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="imageFiles" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list name="imageFiles" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEFILES">
<column name="`IMAGESAUDITING_IMAGEFILES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="java.lang.String"/>
- <element not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`IMAGE_FILENAME`"/>
- </element>
- </map>
- <map name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEFILES_IDX`"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageTypeNames" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGETYPENAMES">
<column name="`IMAGESAUDITING_IMAGETYPENAMES_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.jpa2.maps.EnumType</param>
- <param name="eclassifier">EnumType</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/maps</param>
- </type>
- </map-key>
- <element type="java.lang.String"/>
- </map>
- <map name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGETYPENAMES_IDX`"/>
+ <one-to-many entity-name="EnumToStringMapEntryAuditing"/>
+ </list>
+ <list name="imageDateDescriptions" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_IMAGEDATEDESCRIPTIONS">
<column name="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key type="timestamp"/>
- <element type="java.lang.String"/>
- </map>
- <map name="photoParts" lazy="true" cascade="all,delete-orphan">
- <key update="true">
+ <list-index column="`IMAGESAUDITING_IMAGEDATEDESCRIPTIONS_IDX`"/>
+ <one-to-many entity-name="DateToStringMapEntryAuditing"/>
+ </list>
+ <list name="photoParts" lazy="true" cascade="all,delete-orphan">
+ <key update="true" foreign-key="IMAGESAUDITING_PHOTOPARTS">
<column name="`IMAGESAUDITING_PHOTOPARTS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="PhotoPart"/>
- <element type="java.lang.String"/>
- </map>
+ <list-index column="`IMAGESAUDITING_PHOTOPARTS_IDX`"/>
+ <one-to-many entity-name="StringToPartMapEntryAuditing"/>
+ </list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
- <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -297,7 +289,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -317,8 +309,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToPartMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToPartMapEntryAuditing" table="`STRINGTOPARTMAPENTRYAUDITING`">
@@ -370,15 +365,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="PhotoPartAuditing" abstract="false" lazy="false" discriminator-value="PhotoPartAuditing" table="`PHOTOPARTAUDITING`">
+ <meta attribute="eclassName" inherit="false">PhotoPartAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/jpa2/mapsAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="PHOTOPARTAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -392,7 +387,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="PHOTOPARTAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -412,11 +407,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_e_o_hibernate.hbm.xml
index 5515b2b2e..f25261344 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_e_o_hibernate.hbm.xml
@@ -199,32 +199,32 @@
<column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntry"/>
+ <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
</list>
<list name="keyWords" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_KEYWORDS">
<column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntry"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
</list>
<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CITYBYWRITER">
<column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntry"/>
+ <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
</list>
<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CATEGORYBYDATE">
<column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntry"/>
+ <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOWRITERMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -242,7 +242,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -262,16 +262,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`KEY`"/>
</property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
@@ -320,8 +315,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -339,7 +334,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -366,8 +361,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" table="`DATETOCATEGORYMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -385,7 +380,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -405,12 +400,20 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <column not-null="false" unique="false" name="`VALUE`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+ <param name="eclassifier">Category</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+ </type>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" table="`WRITERAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -428,7 +431,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -448,11 +451,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_h_o_hibernate.hbm.xml
index ce508b385..85c8d5d32 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListAction_hsqldb_h_o_hibernate.hbm.xml
@@ -223,39 +223,39 @@
<column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntry"/>
+ <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
</list>
<list name="keyWords" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_KEYWORDS">
<column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntry"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
</list>
<list name="cityByWriter" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CITYBYWRITER">
<column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntry"/>
+ <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
</list>
<list name="categoryByDate" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CATEGORYBYDATE">
<column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntry"/>
+ <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -269,7 +269,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -289,16 +289,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`KEY`"/>
</property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
@@ -350,15 +345,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -372,7 +367,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -399,15 +394,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -421,7 +416,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -441,19 +436,27 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <column not-null="false" unique="false" name="`VALUE`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+ <param name="eclassifier">Category</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+ </type>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -467,7 +470,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -487,11 +490,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
index abaa22b95..534209839 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_e_o_hibernate.hbm.xml
@@ -199,32 +199,32 @@
<column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntry"/>
+ <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
</list>
<list name="keyWords" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_KEYWORDS">
<column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntry"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
</list>
<list name="cityByWriter" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CITYBYWRITER">
<column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntry"/>
+ <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
</list>
<list name="categoryByDate" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CATEGORYBYDATE">
<column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntry"/>
+ <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOWRITERMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -242,7 +242,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -262,16 +262,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`KEY`"/>
</property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
@@ -320,8 +315,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -339,7 +334,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -366,8 +361,8 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" table="`DATETOCATEGORYMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -385,7 +380,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -405,12 +400,20 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <column not-null="false" unique="false" name="`VALUE`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+ <param name="eclassifier">Category</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+ </type>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" table="`WRITERAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
@@ -428,7 +431,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -448,11 +451,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
index d708e2d4b..eb30fd76f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs/EMapAsListExtraLazyAction_hsqldb_h_o_hibernate.hbm.xml
@@ -223,39 +223,39 @@
<column name="`BOOKAUDITING_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_WRITERS_IDX`"/>
- <one-to-many entity-name="StringToWriterMapEntry"/>
+ <one-to-many entity-name="StringToWriterMapEntryAuditing"/>
</list>
<list name="keyWords" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_KEYWORDS">
<column name="`BOOKAUDITING_KEYWORDS_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_KEYWORDS_IDX`"/>
- <one-to-many entity-name="StringToStringMapEntry"/>
+ <one-to-many entity-name="StringToStringMapEntryAuditing"/>
</list>
<list name="cityByWriter" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CITYBYWRITER">
<column name="`BOOKAUDITING_CITYBYWRITER_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CITYBYWRITER_IDX`"/>
- <one-to-many entity-name="WriterToStringMapEntry"/>
+ <one-to-many entity-name="WriterToStringMapEntryAuditing"/>
</list>
<list name="categoryByDate" inverse="true" lazy="extra" cascade="all,delete-orphan">
<key update="true" foreign-key="BOOKAUDITING_CATEGORYBYDATE">
<column name="`BOOKAUDITING_CATEGORYBYDATE_TENEO_AUDIT_ID`" unique="false"/>
</key>
<list-index column="`BOOKAUDITING_CATEGORYBYDATE_IDX`"/>
- <one-to-many entity-name="DateToCategoryMapEntry"/>
+ <one-to-many entity-name="DateToCategoryMapEntryAuditing"/>
</list>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -269,7 +269,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -289,16 +289,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`KEY`"/>
</property>
- <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
<column not-null="false" unique="false" name="`VALUE`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
- <param name="eclassifier">Category</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
- </type>
</property>
</class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToStringMapEntryAuditing" table="`STRINGTOSTRINGMAPENTRYAUDITING`">
@@ -350,15 +345,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="StringToWriterMapEntryAuditing" abstract="false" lazy="false" discriminator-value="StringToWriterMapEntryAuditing" table="`STRINGTOWRITERMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">StringToWriterMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="STRINGTOWRITERMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -372,7 +367,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="STRINGTOWRITERMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -399,15 +394,15 @@
<column not-null="false" unique="false" name="`VALUE`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="DateToCategoryMapEntryAuditing" abstract="false" lazy="false" discriminator-value="DateToCategoryMapEntryAuditing" table="`DATETOCATEGORYMAPENTRYAUDITING`">
+ <meta attribute="eclassName" inherit="false">DateToCategoryMapEntryAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="DATETOCATEGORYMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -421,7 +416,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="DATETOCATEGORYMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -441,19 +436,27 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`NAME`"/>
+ <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="timestamp">
+ <column not-null="false" unique="false" name="`KEY`"/>
+ </property>
+ <property name="value" lazy="false" not-null="false" insert="true" update="true" unique="false">
+ <column not-null="false" unique="false" name="`VALUE`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.samples.emf.schemaconstructs.emap.Category</param>
+ <param name="eclassifier">Category</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emap</param>
+ </type>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterToStringMapEntryAuditing" abstract="false" lazy="false" discriminator-value="WriterToStringMapEntryAuditing" table="`WRITERTOSTRINGMAPENTRYAUDITING`">
- <meta attribute="eclassName" inherit="false">WriterToStringMapEntryAuditing</meta>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="WriterAuditing" abstract="false" lazy="false" discriminator-value="WriterAuditing" table="`WRITERAUDITING`">
+ <meta attribute="eclassName" inherit="false">WriterAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/schemaconstructs/emapAuditing</meta>
<id name="teneo_audit_id" type="long" unsaved-value="0">
<column not-null="true" unique="false" name="`TENEO_AUDIT_ID`"/>
<generator class="native"/>
</id>
<discriminator type="string">
- <column name="`DTYPE`" index="WRITERTOSTRINGMAPENTRYAUDITINGDTYPE" length="255" not-null="true"/>
+ <column name="`DTYPE`" index="WRITERAUDITINGDTYPE" length="255" not-null="true"/>
</discriminator>
<version name="teneo_version" type="long">
<column not-null="true" unique="false" name="`TENEO_VERSION`"/>
@@ -467,7 +470,7 @@
<property name="teneo_end" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_END`"/>
</property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERTOSTRINGMAPENTRYAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="WRITERAUDITING_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
<column not-null="true" unique="false" name="`TENEOAUDITCOMMITINFO_TENEO_COMMIT_INFO_ID`"/>
</many-to-one>
<property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
@@ -487,11 +490,8 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <property name="key" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`KEY`"/>
- </property>
- <property name="value" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`VALUE`"/>
+ <property name="name" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`NAME`"/>
</property>
</class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz363777Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz363777Action_hsqldb_h_o_hibernate.hbm.xml
index b561e667a..adfdd9105 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz363777Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz363777Action_hsqldb_h_o_hibernate.hbm.xml
@@ -260,12 +260,11 @@
<property name="teneo_previous_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
<column not-null="false" unique="false" name="`TENEO_PREVIOUS_START`"/>
</property>
- <map name="mapChannels" lazy="true" cascade="all,delete-orphan">
+ <bag name="mapChannels" lazy="true" cascade="all,delete-orphan">
<key update="true" foreign-key="NEAUDITING_MAPCHANNELS">
<column name="`NEAUDITING_MAPCHANNELS_TENEO_AUDIT_ID`" unique="false"/>
</key>
- <map-key-many-to-many entity-name="ChannelMap"/>
- <one-to-many entity-name="ChannelMapService"/>
- </map>
+ <one-to-many entity-name="ChanelMapToChanelMapServiceAuditing"/>
+ </bag>
</class>
</hibernate-mapping> \ No newline at end of file

Back to the top