Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-10-01 16:49:23 -0400
committerMartin Taal2013-10-01 16:49:23 -0400
commit5bc1b721eca701165d513b6e04abeafc38fd5d81 (patch)
tree4c129fc848ec182e5852ce3d27861087fb588a64
parent77581ff259328bfc633650a83f9ebfb65b385ed5 (diff)
downloadorg.eclipse.emf.teneo-5bc1b721eca701165d513b6e04abeafc38fd5d81.tar.gz
org.eclipse.emf.teneo-5bc1b721eca701165d513b6e04abeafc38fd5d81.tar.xz
org.eclipse.emf.teneo-5bc1b721eca701165d513b6e04abeafc38fd5d81.zip
[417855] - Value of schema attribute in @Table is lower-cased even when AUTO_ADAPT_MANUAL_SET_SQL_NAMES is false
-rwxr-xr-xhibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java4
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_e_o_hibernate.hbm.xml194
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_h_o_hibernate.hbm.xml203
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml194
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_h_o_hibernate.hbm.xml203
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_e_o_hibernate.hbm.xml175
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_h_o_hibernate.hbm.xml190
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_e_o_hibernate.hbm.xml66
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_h_o_hibernate.hbm.xml72
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_e_o_hibernate.hbm.xml194
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_h_o_hibernate.hbm.xml203
-rwxr-xr-xtests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java1
-rw-r--r--tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz417855Action.java39
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/Book.java8
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnFactory.java9
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnPackage.java68
-rw-r--r--tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/TestSchema.java52
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/BookImpl.java6
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnFactoryImpl.java11
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnPackageImpl.java83
-rw-r--r--tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/TestSchemaImpl.java163
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.ecore37
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.genmodel11
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.xsd8
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnAdapterFactory.java20
-rwxr-xr-xtests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnSwitch.java65
26 files changed, 1013 insertions, 1266 deletions
diff --git a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
index 595bb53fb..8c81e03e9 100755
--- a/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
+++ b/hibernate/org.eclipse.emf.teneo.hibernate.mapper/src/org/eclipse/emf/teneo/hibernate/mapper/EntityMapper.java
@@ -240,11 +240,11 @@ public class EntityMapper extends AbstractMapper implements ExtensionPoint {
log.debug("Table " + table.getName());
}
if (table.getSchema() != null) {
- target.addAttribute("schema", getHbmContext().trunc(null, table.getSchema(), false));
+ target.addAttribute("schema", getHbmContext().trunc(table, table.getSchema(), false));
log.debug("Schema " + table.getSchema());
}
if (table.getCatalog() != null) {
- target.addAttribute("catalog", getHbmContext().trunc(null, table.getCatalog(), false));
+ target.addAttribute("catalog", getHbmContext().trunc(table, table.getCatalog(), false));
log.debug("Catalog " + table.getCatalog());
}
}
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_e_o_hibernate.hbm.xml
index b7c13e84f..97e47a8f2 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_e_o_hibernate.hbm.xml
@@ -102,200 +102,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_h_o_hibernate.hbm.xml
index a12cae46a..a3f4e5606 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz331953Action_hsqldb_h_o_hibernate.hbm.xml
@@ -114,209 +114,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" discriminator-value="audit_Book" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_BOOKDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" discriminator-value="audit_Library" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_LIBRARYDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" discriminator-value="audit_Writer" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_WRITERDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
index f54f17c90..7736f6f80 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_e_o_hibernate.hbm.xml
@@ -217,200 +217,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_h_o_hibernate.hbm.xml
index 2ce6e8ca8..c0690bc38 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz372869Action_hsqldb_h_o_hibernate.hbm.xml
@@ -235,209 +235,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" discriminator-value="audit_Book" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_BOOKDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" discriminator-value="audit_Library" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_LIBRARYDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" discriminator-value="audit_Writer" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_WRITERDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_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">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS_TENEO_AUDIT_ID`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_e_o_hibernate.hbm.xml
new file mode 100644
index 000000000..4e0fcca5f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_e_o_hibernate.hbm.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" table="`mybooktable`">
+ <meta attribute="eclassName" inherit="false">Book</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+ <column not-null="false" unique="true" name="`titel`" length="25"/>
+ </property>
+ <property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`PAGES`"/>
+ </property>
+ <property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+ <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+ </property>
+ <property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`AUTHOR`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl" entity-name="TestSchema" abstract="false" lazy="false" table="`myschematable`" schema="`TEST`">
+ <meta attribute="eclassName" inherit="false">TestSchema</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`TENEOAUDITCOMMITINFO`">
+ <meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+ <id name="id" type="long" unsaved-value="0">
+ <column not-null="true" unique="false" name="`ID`"/>
+ <generator class="native"/>
+ </id>
+ <version name="version" type="long">
+ <column not-null="true" unique="false" name="`VERSION`"/>
+ </version>
+ <property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`USER`"/>
+ </property>
+ <property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`COMMENT`" length="2000"/>
+ </property>
+ <property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`COMMITTIME`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" table="`BOOKAUDITING`">
+ <meta attribute="eclassName" inherit="false">BookAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOKAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </property>
+ <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+ <column not-null="false" unique="true" name="`titel`" length="25"/>
+ </property>
+ <property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`PAGES`"/>
+ </property>
+ <property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+ <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+ </property>
+ <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`AUTHOR`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestSchemaAuditing" abstract="false" lazy="false" table="`TESTSCHEMAAUDITING`">
+ <meta attribute="eclassName" inherit="false">TestSchemaAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSCHEMAAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </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>
+ </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/Bz417855Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_h_o_hibernate.hbm.xml
new file mode 100644
index 000000000..d9d5f6546
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz417855Action_hsqldb_h_o_hibernate.hbm.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping auto-import="false">
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.BookImpl" entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`mybooktable`">
+ <meta attribute="eclassName" inherit="false">Book</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <discriminator type="string">
+ <column name="`DTYPE`" index="mybooktableDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+ <column not-null="false" unique="true" name="`titel`" length="25"/>
+ </property>
+ <property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`PAGES`"/>
+ </property>
+ <property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+ <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+ </property>
+ <property name="author" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`AUTHOR`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl" entity-name="TestSchema" abstract="false" lazy="false" discriminator-value="TestSchema" table="`myschematable`" schema="`TEST`">
+ <meta attribute="eclassName" inherit="false">TestSchema</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <discriminator type="string">
+ <column name="`DTYPE`" index="myschematableDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" discriminator-value="TeneoAuditCommitInfo" table="`TENEOAUDITCOMMITINFO`">
+ <meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
+ <id name="id" type="long" unsaved-value="0">
+ <column not-null="true" unique="false" name="`ID`"/>
+ <generator class="native"/>
+ </id>
+ <discriminator type="string">
+ <column name="`DTYPE`" index="TENEOAUDITCOMMITINFODTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="version" type="long">
+ <column not-null="true" unique="false" name="`VERSION`"/>
+ </version>
+ <property name="user" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`USER`"/>
+ </property>
+ <property name="comment" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`COMMENT`" length="2000"/>
+ </property>
+ <property name="commitTime" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`COMMITTIME`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
+ <meta attribute="eclassName" inherit="false">BookAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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="BOOKAUDITINGDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="BOOKAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </property>
+ <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="true" type="java.lang.String">
+ <column not-null="false" unique="true" name="`titel`" length="25"/>
+ </property>
+ <property name="pages" lazy="false" insert="false" update="false" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`PAGES`"/>
+ </property>
+ <property name="weight" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.math.BigDecimal">
+ <column not-null="false" unique="false" name="`gewicht`" precision="5" scale="2"/>
+ </property>
+ <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`AUTHOR`"/>
+ </property>
+ </class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestSchemaAuditing" abstract="false" lazy="false" discriminator-value="TestSchemaAuditing" table="`TESTSCHEMAAUDITING`">
+ <meta attribute="eclassName" inherit="false">TestSchemaAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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="TESTSCHEMAAUDITINGDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSCHEMAAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </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>
+ </class>
+</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_e_o_hibernate.hbm.xml
index a5f472507..cb6beaf23 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_e_o_hibernate.hbm.xml
@@ -25,6 +25,20 @@
<column not-null="true" unique="false" name="`AUTHOR`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl" entity-name="TestSchema" abstract="false" lazy="false" table="`MYSCHEMATABLE`" schema="`TEST`">
+ <meta attribute="eclassName" inherit="false">TestSchema</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" table="`TENEOAUDITCOMMITINFO`">
<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
@@ -106,4 +120,56 @@
<column not-null="false" unique="false" name="`AUTHOR`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestSchemaAuditing" abstract="false" lazy="false" table="`TESTSCHEMAAUDITING`">
+ <meta attribute="eclassName" inherit="false">TestSchemaAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSCHEMAAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </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>
+ </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_h_o_hibernate.hbm.xml
index d66bcf3ca..4ef867dee 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.annotations/BookAction_hsqldb_h_o_hibernate.hbm.xml
@@ -28,6 +28,23 @@
<column not-null="true" unique="false" name="`AUTHOR`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl" entity-name="TestSchema" abstract="false" lazy="false" discriminator-value="TestSchema" table="`MYSCHEMATABLE`" schema="`TEST`">
+ <meta attribute="eclassName" inherit="false">TestSchema</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/column</meta>
+ <id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+ <meta attribute="syntheticId" inherit="false">true</meta>
+ <generator class="native"/>
+ </id>
+ <discriminator type="string">
+ <column name="`DTYPE`" index="myschematableDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+ <meta attribute="syntheticVersion" inherit="false">true</meta>
+ </version>
+ <property name="name" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
+ <column not-null="true" unique="false" name="`NAME`"/>
+ </property>
+ </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditCommitInfoImpl" entity-name="TeneoAuditCommitInfo" abstract="false" lazy="false" discriminator-value="TeneoAuditCommitInfo" table="`TENEOAUDITCOMMITINFO`">
<meta attribute="eclassName" inherit="false">TeneoAuditCommitInfo</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/hibernate/auditing</meta>
@@ -115,4 +132,59 @@
<column not-null="false" unique="false" name="`AUTHOR`"/>
</property>
</class>
+ <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="TestSchemaAuditing" abstract="false" lazy="false" discriminator-value="TestSchemaAuditing" table="`TESTSCHEMAAUDITING`">
+ <meta attribute="eclassName" inherit="false">TestSchemaAuditing</meta>
+ <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/annotations/columnAuditing</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="TESTSCHEMAAUDITINGDTYPE" length="255" not-null="true"/>
+ </discriminator>
+ <version name="teneo_version" type="long">
+ <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
+ </version>
+ <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
+ </property>
+ <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
+ </property>
+ <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
+ </property>
+ <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`" unique-key="c1"/>
+ </property>
+ <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="TESTSCHEMAAUDITING_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">
+ <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
+ <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
+ <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
+ <param name="eclassifier">TeneoAuditKind</param>
+ <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
+ </type>
+ </property>
+ <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
+ </property>
+ <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
+ <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
+ </property>
+ <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`" unique-key="c2"/>
+ </property>
+ <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
+ <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
+ </property>
+ <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
+ <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
+ </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>
+ </class>
</hibernate-mapping> \ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_e_o_hibernate.hbm.xml
index 37b81eb9b..78acd1740 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_e_o_hibernate.hbm.xml
@@ -102,200 +102,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_h_o_hibernate.hbm.xml
index bfe5f39fd..501fabbd3 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ249440Action_hsqldb_h_o_hibernate.hbm.xml
@@ -114,209 +114,6 @@
<column not-null="false" unique="false" name="`COMMITTIME`"/>
</property>
</class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Book" abstract="false" lazy="false" discriminator-value="audit_Book" table="`AUDIT_BOOK`">
- <meta attribute="eclassName" inherit="false">audit_Book</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_BOOKDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_BOOK_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </property>
- <property name="title" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TITLE`"/>
- </property>
- <property name="pages" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`PAGES`"/>
- </property>
- <property name="category" lazy="false" not-null="false" insert="true" update="true" unique="false">
- <column not-null="false" unique="false" name="`CATEGORY`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
- <param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
- <param name="eclassifier">BookCategory</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
- </type>
- </property>
- <property name="author" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`AUTHOR`"/>
- </property>
- <property name="test" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TEST`"/>
- </property>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Library" abstract="false" lazy="false" discriminator-value="audit_Library" table="`AUDIT_LIBRARY`">
- <meta attribute="eclassName" inherit="false">audit_Library</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_LIBRARYDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_LIBRARY_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="writers" table="`AUDIT_LIBRARY_WRITERSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_WRITERS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_WRITERS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_WRITERS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- <list name="books" table="`AUDIT_LIBRARY_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_LIBRARY_BOOKS_KEY" update="true">
- <column name="`AUDIT_LIBRARY_BOOKS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_LIBRARY_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
- <class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="audit_Writer" abstract="false" lazy="false" discriminator-value="audit_Writer" table="`AUDIT_WRITER`">
- <meta attribute="eclassName" inherit="false">audit_Writer</meta>
- <meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</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="AUDIT_WRITERDTYPE" length="255" not-null="true"/>
- </discriminator>
- <version name="teneo_version" type="long">
- <column not-null="true" unique="false" name="`TENEO_VERSION`"/>
- </version>
- <property name="teneo_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_ID`" unique-key="c0,c1,c2"/>
- </property>
- <property name="teneo_owner_object_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_OWNER_OBJECT_ID`"/>
- </property>
- <property name="teneo_start" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_START`" unique-key="c0"/>
- </property>
- <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`" unique-key="c1"/>
- </property>
- <many-to-one name="teneo_commit_info" entity-name="TeneoAuditCommitInfo" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="AUDIT_WRITER_TENEO_COMMIT_INFO" insert="true" update="true" not-null="true">
- <column not-null="true" unique="false" name="`TENEO_COMMIT_INFO`"/>
- </many-to-one>
- <property name="teneo_audit_kind" lazy="false" not-null="true" insert="true" update="true" unique="false">
- <column not-null="true" unique="false" name="`TENEO_AUDIT_KIND`"/>
- <type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserType">
- <param name="enumClass">org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.TeneoAuditKind</param>
- <param name="eclassifier">TeneoAuditKind</param>
- <param name="epackage">http://www.eclipse.org/emf/teneo/hibernate/auditing</param>
- </type>
- </property>
- <property name="teneo_container_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_ID`"/>
- </property>
- <property name="teneo_container_feature_id" lazy="false" insert="true" update="true" not-null="false" unique="false" type="int">
- <column not-null="false" unique="false" name="`TENEO_CONTAINER_FEATURE_ID`"/>
- </property>
- <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`" unique-key="c2"/>
- </property>
- <property name="teneo_object_version" lazy="false" insert="true" update="true" not-null="false" unique="false" type="long">
- <column not-null="false" unique="false" name="`TENEO_OBJECT_VERSION`"/>
- </property>
- <property name="teneo_resourceid" lazy="false" insert="true" update="true" not-null="false" unique="false" type="java.lang.String">
- <column not-null="false" unique="false" name="`TENEO_RESOURCEID`"/>
- </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>
- <list name="books" table="`AUDIT_WRITER_BOOKSAUDITING`" lazy="true" cascade="all">
- <key foreign-key="AUDIT_WRITER_BOOKS_KEY" update="true">
- <column name="`AUDIT_WRITER_BOOKS`" unique="false"/>
- </key>
- <list-index column="`AUDIT_WRITER_BOOKS_IDX`"/>
- <element type="java.lang.String"/>
- </list>
- </class>
<class name="org.eclipse.emf.teneo.hibernate.auditing.model.teneoauditing.impl.TeneoAuditEntryImpl" entity-name="BookAuditing" abstract="false" lazy="false" discriminator-value="BookAuditing" table="`BOOKAUDITING`">
<meta attribute="eclassName" inherit="false">BookAuditing</meta>
<meta attribute="epackage" inherit="false">http://www.eclipse.org/emf/teneo/samples/emf/sample/LibraryAuditing</meta>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
index 986f2ffff..a20c7903c 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/AllTests.java
@@ -54,6 +54,7 @@ public class AllTests {
public static Test suite() {
TestSuite suite = new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.issues",
HibernateTestbed.instance().getConfigurations());
+ suite.addTestSuite(Bz417855Action.class);
suite.addTestSuite(Bz401710Action.class);
suite.addTestSuite(Bz400088Action.class);
// suite.addTestSuite(PersistUMLAction.class);
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz417855Action.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz417855Action.java
new file mode 100644
index 000000000..0b489745e
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/issues/Bz417855Action.java
@@ -0,0 +1,39 @@
+/**
+ * <copyright> Copyright (c) 2005, 2006, 2007, 2008 Springsite BV (The Netherlands) and others All rights
+ * reserved. This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html Contributors: Martin Taal </copyright> $Id:
+ * AgilAction.java,v 1.1 2007/03/28 13:58:33 mtaal Exp $
+ */
+
+package org.eclipse.emf.teneo.hibernate.test.issues;
+
+import java.util.Properties;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.teneo.PersistenceOptions;
+import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage;
+import org.eclipse.emf.teneo.test.AbstractTestAction;
+import org.eclipse.emf.teneo.test.stores.TestStore;
+
+/**
+ * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
+ * @version $Revision: 1.1 $
+ */
+public class Bz417855Action extends AbstractTestAction {
+
+ public Bz417855Action() {
+ super(new EPackage[] { ColumnPackage.eINSTANCE });
+ }
+
+ @Override
+ public Properties getExtraConfigurationProperties() {
+ final Properties props = new Properties();
+ props.setProperty(PersistenceOptions.AUTO_ADAPT_MANUAL_SET_SQL_NAMES, "false");
+ return props;
+ }
+
+ @Override
+ public void doAction(TestStore store) {
+ }
+}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/Book.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/Book.java
index 3ed4d8f72..e1ae08b0a 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/Book.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/Book.java
@@ -42,7 +42,7 @@ public interface Book extends EObject {
* @return the value of the '<em>Title</em>' attribute.
* @see #setTitle(String)
* @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getBook_Title()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* annotation="teneo.jpa appinfo='@Column(name=\"titel\" unique=\"true\" length=\"25\")'"
* extendedMetaData="kind='element' name='title'"
* @generated
@@ -72,7 +72,7 @@ public interface Book extends EObject {
* @see #unsetPages()
* @see #setPages(int)
* @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getBook_Pages()
- * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true"
+ * @model unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Int" required="true"
* annotation="teneo.jpa appinfo='@Column(updatable=\"false\" insertable=\"false\")'"
* extendedMetaData="kind='element' name='pages'"
* @generated
@@ -125,7 +125,7 @@ public interface Book extends EObject {
* @return the value of the '<em>Weight</em>' attribute.
* @see #setWeight(BigDecimal)
* @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getBook_Weight()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.Decimal" required="true"
+ * @model dataType="org.eclipse.emf.ecore.xml.type.Decimal" required="true"
* annotation="teneo.jpa appinfo='@Column(name=\"gewicht\" nullable=\"true\" precision=\"5\" scale=\"2\")'"
* extendedMetaData="kind='element' name='weight'"
* @generated
@@ -153,7 +153,7 @@ public interface Book extends EObject {
* @return the value of the '<em>Author</em>' attribute.
* @see #setAuthor(String)
* @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getBook_Author()
- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
* extendedMetaData="kind='element' name='author'"
* @generated
*/
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnFactory.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnFactory.java
index 4dc287e6e..a8ef20a31 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnFactory.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnFactory.java
@@ -35,6 +35,15 @@ public interface ColumnFactory extends EFactory {
Book createBook();
/**
+ * Returns a new object of class '<em>Test Schema</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Test Schema</em>'.
+ * @generated
+ */
+ TestSchema createTestSchema();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnPackage.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnPackage.java
index 109916580..3aa7b1b1c 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnPackage.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/ColumnPackage.java
@@ -115,6 +115,35 @@ public interface ColumnPackage extends EPackage {
/**
+ * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl <em>Test Schema</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.impl.ColumnPackageImpl#getTestSchema()
+ * @generated
+ */
+ int TEST_SCHEMA = 1;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TEST_SCHEMA__NAME = 0;
+
+ /**
+ * The number of structural features of the '<em>Test Schema</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int TEST_SCHEMA_FEATURE_COUNT = 1;
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.Book <em>Book</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -169,6 +198,27 @@ public interface ColumnPackage extends EPackage {
EAttribute getBook_Author();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema <em>Test Schema</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Test Schema</em>'.
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema
+ * @generated
+ */
+ EClass getTestSchema();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema#getName()
+ * @see #getTestSchema()
+ * @generated
+ */
+ EAttribute getTestSchema_Name();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -232,6 +282,24 @@ public interface ColumnPackage extends EPackage {
*/
EAttribute BOOK__AUTHOR = eINSTANCE.getBook_Author();
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl <em>Test Schema</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.impl.ColumnPackageImpl#getTestSchema()
+ * @generated
+ */
+ EClass TEST_SCHEMA = eINSTANCE.getTestSchema();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute TEST_SCHEMA__NAME = eINSTANCE.getTestSchema_Name();
+
}
} //ColumnPackage
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/TestSchema.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/TestSchema.java
new file mode 100644
index 000000000..d21b92008
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/TestSchema.java
@@ -0,0 +1,52 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.column;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Test Schema</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getTestSchema()
+ * @model annotation="teneo.jpa appinfo='@Table(name=\"myschematable\", schema=\"TEST\")'"
+ * extendedMetaData="name='TestSchema' kind='elementOnly'"
+ * @generated
+ */
+public interface TestSchema extends EObject {
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage#getTestSchema_Name()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+ * extendedMetaData="kind='element' name='name'"
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+} // TestSchema
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/BookImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/BookImpl.java
index 713574df1..e7b1ae9ff 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/BookImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/BookImpl.java
@@ -79,7 +79,7 @@ public class BookImpl extends EObjectImpl implements Book {
* @generated
* @ordered
*/
- protected boolean pagesESet = false;
+ protected boolean pagesESet;
/**
* The default value of the '{@link #getWeight() <em>Weight</em>}' attribute.
@@ -260,7 +260,7 @@ public class BookImpl extends EObjectImpl implements Book {
case ColumnPackage.BOOK__TITLE:
return getTitle();
case ColumnPackage.BOOK__PAGES:
- return new Integer(getPages());
+ return getPages();
case ColumnPackage.BOOK__WEIGHT:
return getWeight();
case ColumnPackage.BOOK__AUTHOR:
@@ -281,7 +281,7 @@ public class BookImpl extends EObjectImpl implements Book {
setTitle((String)newValue);
return;
case ColumnPackage.BOOK__PAGES:
- setPages(((Integer)newValue).intValue());
+ setPages((Integer)newValue);
return;
case ColumnPackage.BOOK__WEIGHT:
setWeight((BigDecimal)newValue);
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnFactoryImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnFactoryImpl.java
index c9aabe855..af0b9556b 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnFactoryImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnFactoryImpl.java
@@ -61,6 +61,7 @@ public class ColumnFactoryImpl extends EFactoryImpl implements ColumnFactory {
public EObject create(EClass eClass) {
switch (eClass.getClassifierID()) {
case ColumnPackage.BOOK: return createBook();
+ case ColumnPackage.TEST_SCHEMA: return createTestSchema();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -81,6 +82,16 @@ public class ColumnFactoryImpl extends EFactoryImpl implements ColumnFactory {
* <!-- end-user-doc -->
* @generated
*/
+ public TestSchema createTestSchema() {
+ TestSchemaImpl testSchema = new TestSchemaImpl();
+ return testSchema;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public ColumnPackage getColumnPackage() {
return (ColumnPackage)getEPackage();
}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnPackageImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnPackageImpl.java
index 5aea530d0..dd3d96088 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnPackageImpl.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/ColumnPackageImpl.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
import org.eclipse.emf.teneo.samples.emf.annotations.column.Book;
import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnFactory;
import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema;
/**
* <!-- begin-user-doc -->
@@ -30,6 +31,13 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
private EClass bookEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass testSchemaEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -56,20 +64,10 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link ColumnPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -81,7 +79,7 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
if (isInited) return (ColumnPackage)EPackage.Registry.INSTANCE.getEPackage(ColumnPackage.eNS_URI);
// Obtain or create and register package
- ColumnPackageImpl theColumnPackage = (ColumnPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ColumnPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ColumnPackageImpl());
+ ColumnPackageImpl theColumnPackage = (ColumnPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ColumnPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new ColumnPackageImpl());
isInited = true;
@@ -97,6 +95,9 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
// Mark meta-data to indicate it can't be changed
theColumnPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(ColumnPackage.eNS_URI, theColumnPackage);
return theColumnPackage;
}
@@ -150,6 +151,24 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getTestSchema() {
+ return testSchemaEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getTestSchema_Name() {
+ return (EAttribute)testSchemaEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public ColumnFactory getColumnFactory() {
return (ColumnFactory)getEFactoryInstance();
}
@@ -178,6 +197,9 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
createEAttribute(bookEClass, BOOK__PAGES);
createEAttribute(bookEClass, BOOK__WEIGHT);
createEAttribute(bookEClass, BOOK__AUTHOR);
+
+ testSchemaEClass = createEClass(TEST_SCHEMA);
+ createEAttribute(testSchemaEClass, TEST_SCHEMA__NAME);
}
/**
@@ -214,10 +236,13 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
// Initialize classes and features; add operations and parameters
initEClass(bookEClass, Book.class, "Book", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getBook_Title(), theXMLTypePackage.getString(), "title", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBook_Pages(), theXMLTypePackage.getInt(), "pages", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBook_Weight(), theXMLTypePackage.getDecimal(), "weight", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBook_Author(), theXMLTypePackage.getString(), "author", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBook_Title(), theXMLTypePackage.getString(), "title", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBook_Pages(), theXMLTypePackage.getInt(), "pages", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBook_Weight(), theXMLTypePackage.getDecimal(), "weight", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBook_Author(), theXMLTypePackage.getString(), "author", null, 1, 1, Book.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(testSchemaEClass, TestSchema.class, "TestSchema", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestSchema_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, TestSchema.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
@@ -260,6 +285,12 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
source,
new String[] {
"appinfo", "@Column(name=\"gewicht\" nullable=\"true\" precision=\"5\" scale=\"2\")"
+ });
+ addAnnotation
+ (testSchemaEClass,
+ source,
+ new String[] {
+ "appinfo", "@Table(name=\"myschematable\", schema=\"TEST\")"
});
}
@@ -305,6 +336,20 @@ public class ColumnPackageImpl extends EPackageImpl implements ColumnPackage {
new String[] {
"kind", "element",
"name", "author"
+ });
+ addAnnotation
+ (testSchemaEClass,
+ source,
+ new String[] {
+ "name", "TestSchema",
+ "kind", "elementOnly"
+ });
+ addAnnotation
+ (getTestSchema_Name(),
+ source,
+ new String[] {
+ "kind", "element",
+ "name", "name"
});
}
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/TestSchemaImpl.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/TestSchemaImpl.java
new file mode 100644
index 000000000..856cd1c71
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/impl/TestSchemaImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.column.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Schema</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.column.impl.TestSchemaImpl#getName <em>Name</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TestSchemaImpl extends EObjectImpl implements TestSchema {
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected TestSchemaImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return ColumnPackage.Literals.TEST_SCHEMA;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(String newName) {
+ String oldName = name;
+ name = newName;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, ColumnPackage.TEST_SCHEMA__NAME, oldName, name));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case ColumnPackage.TEST_SCHEMA__NAME:
+ return getName();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case ColumnPackage.TEST_SCHEMA__NAME:
+ setName((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case ColumnPackage.TEST_SCHEMA__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case ColumnPackage.TEST_SCHEMA__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(')');
+ return result.toString();
+ }
+
+} //TestSchemaImpl
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.ecore b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.ecore
index 0c28692ab..589984b33 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.ecore
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.ecore
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="column"
- nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/column" nsPrefix="column">
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="column" nsURI="http://www.eclipse.org/emf/teneo/samples/emf/annotations/column"
+ nsPrefix="column">
<eClassifiers xsi:type="ecore:EClass" name="Book">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@Table(name=&quot;mybooktable&quot;)"/>
@@ -11,8 +10,7 @@
<details key="name" value="Book"/>
<details key="kind" value="elementOnly"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@Column(name=&quot;titel&quot; unique=&quot;true&quot; length=&quot;25&quot;)"/>
</eAnnotations>
@@ -21,8 +19,8 @@
<details key="name" value="title"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" unique="false" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int" unsettable="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="pages" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Int"
+ unsettable="true">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@Column(updatable=&quot;false&quot; insertable=&quot;false&quot;)"/>
</eAnnotations>
@@ -31,8 +29,8 @@
<details key="name" value="pages"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="weight" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="weight" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Decimal">
<eAnnotations source="teneo.jpa">
<details key="appinfo" value="@Column(name=&quot;gewicht&quot; nullable=&quot;true&quot; precision=&quot;5&quot; scale=&quot;2&quot;)"/>
</eAnnotations>
@@ -41,12 +39,27 @@
<details key="name" value="weight"/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" unique="false"
- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
<details key="kind" value="element"/>
<details key="name" value="author"/>
</eAnnotations>
</eStructuralFeatures>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="TestSchema">
+ <eAnnotations source="teneo.jpa">
+ <details key="appinfo" value="@Table(name=&quot;myschematable&quot;, schema=&quot;TEST&quot;)"/>
+ </eAnnotations>
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="name" value="TestSchema"/>
+ <details key="kind" value="elementOnly"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String">
+ <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+ <details key="kind" value="element"/>
+ <details key="name" value="name"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.genmodel b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.genmodel
index 67c42e08d..d6cdb339e 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.genmodel
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.genmodel
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
- modelPluginID="org.eclipse.emf.teneo.samples" modelName="Column" importerID="org.eclipse.xsd.ecore.importer"
- complianceLevel="5.0">
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src" modelPluginID="org.eclipse.emf.teneo.samples"
+ modelName="Column" importerID="org.eclipse.xsd.ecore.importer" complianceLevel="5.0">
<foreignModel>column.xsd</foreignModel>
<genPackages prefix="Column" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
resource="XML" disposableProviderFactory="true" ecorePackage="column.ecore#/">
@@ -13,5 +11,8 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute column.ecore#//Book/weight"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute column.ecore#//Book/author"/>
</genClasses>
+ <genClasses ecoreClass="column.ecore#//TestSchema">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute column.ecore#//TestSchema/name"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.xsd b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.xsd
index 65da85101..8c6ee9631 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.xsd
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/model/column.xsd
@@ -26,4 +26,12 @@
<xsd:element name="author" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="TestSchema">
+ <xsd:annotation>
+ <xsd:appinfo source="teneo.jpa">@Table(name="myschematable", schema="TEST")</xsd:appinfo>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
</xsd:schema>
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnAdapterFactory.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnAdapterFactory.java
index f35956aef..a6f1deb2c 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnAdapterFactory.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnAdapterFactory.java
@@ -63,7 +63,7 @@ public class ColumnAdapterFactory extends AdapterFactoryImpl {
}
/**
- * The switch the delegates to the <code>createXXX</code> methods.
+ * The switch that delegates to the <code>createXXX</code> methods.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -75,6 +75,10 @@ public class ColumnAdapterFactory extends AdapterFactoryImpl {
return createBookAdapter();
}
@Override
+ public Adapter caseTestSchema(TestSchema object) {
+ return createTestSchemaAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -109,6 +113,20 @@ public class ColumnAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema <em>Test Schema</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.column.TestSchema
+ * @generated
+ */
+ public Adapter createTestSchemaAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
diff --git a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnSwitch.java b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnSwitch.java
index 48146e8b1..75a01074b 100755
--- a/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnSwitch.java
+++ b/tests/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/column/util/ColumnSwitch.java
@@ -10,6 +10,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.emf.teneo.samples.emf.annotations.column.*;
import org.eclipse.emf.teneo.samples.emf.annotations.column.Book;
import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage;
@@ -27,7 +29,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage;
* @see org.eclipse.emf.teneo.samples.emf.annotations.column.ColumnPackage
* @generated
*/
-public class ColumnSwitch<T> {
+public class ColumnSwitch<T> extends Switch<T> {
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -49,34 +51,16 @@ public class ColumnSwitch<T> {
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ * Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @parameter ePackage the package in question.
+ * @return whether this is a switch for the given package.
* @generated
*/
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- else {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return
- eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
}
/**
@@ -86,6 +70,7 @@ public class ColumnSwitch<T> {
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
+ @Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
case ColumnPackage.BOOK: {
@@ -94,18 +79,24 @@ public class ColumnSwitch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case ColumnPackage.TEST_SCHEMA: {
+ TestSchema testSchema = (TestSchema)theEObject;
+ T result = caseTestSchema(testSchema);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Book</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Book</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Book</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Book</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -114,16 +105,32 @@ public class ColumnSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Test Schema</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Test Schema</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTestSchema(TestSchema object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+ * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object) {
return null;
}

Back to the top