[270298]teneo_1_0_4

5 files changed, 86 insertions, 82 deletions

diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml
index 3b28bbe22..ff3b837c5 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_a_o_hibernate.hbm.xml
@@ -6,87 +6,87 @@
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
 		<param name="edatatype">BookCategoryObject</param>
 	</typedef>
-	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`book`">
+	<class entity-name="Book" abstract="false" lazy="false" discriminator-value="Book" table="`tab_book`">
 		<meta attribute="eclassName">Book</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<discriminator column="`col_dtype`" type="string"/>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`" length="50"/>
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
 		</property>
 		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`pages`"/>
+			<column not-null="true" unique="false" name="`col_pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
-			<column not-null="true" unique="false" name="`category`"/>
+			<column not-null="true" unique="false" name="`col_category`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
 			</type>
 		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
 		</many-to-one>
 	</class>
-	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`library`">
+	<class entity-name="Library" abstract="false" lazy="false" discriminator-value="Library" table="`tab_library`">
 		<meta attribute="eclassName">Library</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<discriminator column="`col_dtype`" type="string"/>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
 			<key update="true" foreign-key="schrijvers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_writers_idx`"/>
+			<list-index column="`col_library_writers_idx`"/>
 			<one-to-many entity-name="Writer"/>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_books_idx`"/>
+			<list-index column="`col_library_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
-	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`writer`">
+	<class entity-name="Writer" abstract="false" lazy="false" discriminator-value="Writer" table="`tab_writer`">
 		<meta attribute="eclassName">Writer</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<discriminator column="`dtype`" type="string"/>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<discriminator column="`col_dtype`" type="string"/>
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
 			<cache usage="read-write"/>
 			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`writer_books_idx`"/>
+			<list-index column="`col_writer_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml
index 0a1dbbf52..732513078 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_e_o_hibernate.hbm.xml
@@ -6,84 +6,84 @@
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
 		<param name="edatatype">BookCategoryObject</param>
 	</typedef>
-	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+	<class entity-name="Book" abstract="false" lazy="false" table="`tab_book`">
 		<meta attribute="eclassName">Book</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`" length="50"/>
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
 		</property>
 		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`pages`"/>
+			<column not-null="true" unique="false" name="`col_pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
-			<column not-null="true" unique="false" name="`category`"/>
+			<column not-null="true" unique="false" name="`col_category`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
 			</type>
 		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
 		</many-to-one>
 	</class>
-	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+	<class entity-name="Library" abstract="false" lazy="false" table="`tab_library`">
 		<meta attribute="eclassName">Library</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
 			<key update="true" foreign-key="schrijvers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_writers_idx`"/>
+			<list-index column="`col_library_writers_idx`"/>
 			<one-to-many entity-name="Writer"/>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_books_idx`"/>
+			<list-index column="`col_library_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
-	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+	<class entity-name="Writer" abstract="false" lazy="false" table="`tab_writer`">
 		<meta attribute="eclassName">Writer</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
 			<cache usage="read-write"/>
 			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`writer_books_idx`"/>
+			<list-index column="`col_writer_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml
index 0a1dbbf52..732513078 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryTest$1_mysql_s_o_hibernate.hbm.xml
@@ -6,84 +6,84 @@
 		<param name="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</param>
 		<param name="edatatype">BookCategoryObject</param>
 	</typedef>
-	<class entity-name="Book" abstract="false" lazy="false" table="`book`">
+	<class entity-name="Book" abstract="false" lazy="false" table="`tab_book`">
 		<meta attribute="eclassName">Book</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">true</meta>
 		</version>
 		<property name="title" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
-			<column not-null="true" unique="false" name="`title`" length="50"/>
+			<column not-null="true" unique="false" name="`col_title`" length="50"/>
 		</property>
 		<property name="pages" lazy="false" insert="true" update="true" not-null="true" unique="false" type="int">
-			<column not-null="true" unique="false" name="`pages`"/>
+			<column not-null="true" unique="false" name="`col_pages`"/>
 		</property>
 		<property name="category" lazy="false" not-null="true" insert="true" update="true" unique="false">
-			<column not-null="true" unique="false" name="`category`"/>
+			<column not-null="true" unique="false" name="`col_category`"/>
 			<type name="org.eclipse.emf.teneo.hibernate.mapping.ENumUserIntegerType">
 				<param name="enumClass">org.eclipse.emf.teneo.samples.emf.sample.library.BookCategory</param>
 			</type>
 		</property>
-		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="book_author" insert="false" update="false" not-null="false">
-			<column not-null="false" unique="false" name="`book_author_e_id`"/>
+		<many-to-one name="author" entity-name="Writer" lazy="false" cascade="merge,persist,save-update,lock,refresh" foreign-key="FKPRE_book_author" insert="false" update="false" not-null="false">
+			<column not-null="false" unique="false" name="`col_book_author_e_id`"/>
 		</many-to-one>
 	</class>
-	<class entity-name="Library" abstract="false" lazy="false" table="`library`">
+	<class entity-name="Library" abstract="false" lazy="false" table="`tab_library`">
 		<meta attribute="eclassName">Library</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="writers" fetch="subselect" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
 			<key update="true" foreign-key="schrijvers">
-				<column name="`library_writers_e_id`" not-null="false" unique="false"/>
+				<column name="`col_library_writers_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_writers_idx`"/>
+			<list-index column="`col_library_writers_idx`"/>
 			<one-to-many entity-name="Writer"/>
 		</list>
 		<list name="books" lazy="true" cascade="all,delete-orphan">
 			<cache usage="read-write"/>
-			<key update="true" foreign-key="library_books">
-				<column name="`library_books_e_id`" not-null="false" unique="false"/>
+			<key update="true" foreign-key="FKPRE_library_books">
+				<column name="`col_library_books_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`library_books_idx`"/>
+			<list-index column="`col_library_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
-	<class entity-name="Writer" abstract="false" lazy="false" table="`writer`">
+	<class entity-name="Writer" abstract="false" lazy="false" table="`tab_writer`">
 		<meta attribute="eclassName">Writer</meta>
 		<meta attribute="epackage">http://www.eclipse.org/emf/teneo/samples/emf/sample/Library</meta>
 		<cache usage="read-write"/>
-		<id type="long" name="e_id" column="e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
+		<id type="long" name="COL_e_id" column="COL_e_id" access="org.eclipse.emf.teneo.hibernate.mapping.identifier.IdentifierPropertyHandler">
 			<meta attribute="syntheticId">true</meta>
 			<generator class="native"/>
 		</id>
-		<version name="e_version" column="e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
+		<version name="COL_e_version" column="COL_e_version" access="org.eclipse.emf.teneo.hibernate.mapping.property.VersionPropertyHandler">
 			<meta attribute="syntheticVersion">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`" length="50"/>
+			<column not-null="true" unique="false" name="`col_name`" length="50"/>
 		</property>
 		<list name="books" lazy="true" cascade="merge,persist,save-update,lock,refresh">
 			<cache usage="read-write"/>
 			<key update="true">
-				<column name="`book_author_e_id`" not-null="false" unique="false"/>
+				<column name="`col_book_author_e_id`" not-null="false" unique="false"/>
 			</key>
-			<list-index column="`writer_books_idx`"/>
+			<list-index column="`col_writer_books_idx`"/>
 			<one-to-many entity-name="Book"/>
 		</list>
 	</class>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
index b24fc405d..c43a685b7 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
@@ -54,24 +54,23 @@ import org.eclipse.emf.teneo.test.issues.ResourceUnloadAction;
  * All sample tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.94 $
+ * @version $Revision: 1.95 $
  */
 public class AllTests {
 
 	public static Test suite() {
-		TestSuite suite = new MultiCfgTestSuite(
-				"Test for org.eclipse.emf.teneo.hibernate.test.emf.sample",
-				HibernateTestbed.instance().getConfigurations());
+		TestSuite suite =
+				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.sample", HibernateTestbed
+					.instance().getConfigurations());
 		// suite.addTestSuite(LibraryLargeAction.class);
 
+		suite.addTestSuite(LibraryTest.class);
 		suite.addTestSuite(LibraryNotifyingTestAction.class);
 		suite.addTestSuite(LibraryContainerFeatureIDFeatureIDAction.class);
 		suite.addTestSuite(LibraryContainerFeatureIDBothAction.class);
 
 		suite.addTestSuite(FleetAction.class);
 
-		suite.addTestSuite(LibraryTest.class);
-
 		suite.addTestSuite(ListAsIdBagAction.class);
 
 		suite.addTestSuite(LibraryResourceAction.class);
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java
index 50c6166b2..2a14c8ae1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/LibraryTest.java
@@ -11,13 +11,14 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: LibraryTest.java,v 1.12 2008/07/13 13:13:38 mtaal Exp $
+ * $Id: LibraryTest.java,v 1.13 2009/03/30 07:53:18 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.test.emf.sample;
 
 import java.util.Properties;
 
+import org.eclipse.emf.teneo.PersistenceOptions;
 import org.eclipse.emf.teneo.hibernate.test.stores.HibernateTestStore;
 import org.eclipse.emf.teneo.mapping.elist.PersistableEList;
 import org.eclipse.emf.teneo.mapping.strategy.impl.TeneoSQLNameStrategy;
@@ -32,15 +33,16 @@ import org.eclipse.emf.teneo.test.stores.TestStore;
  * Tests the library example of emf/xsd.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
  */
 public class LibraryTest extends AbstractActionTest {
 
 	private static LibraryAction testAction = new LibraryAction() {
 		@Override
 		protected void checkContainerAfterLibraryRetrieve(TestStore store, Writer writ) {
-// Session s = ((HibernateTestStore) store).getSession();
-// List<?> l = s.createSQLQuery("SELECT * FROM book").addEntity("Book").list();
+			// Session s = ((HibernateTestStore) store).getSession();
+			// List<?> l =
+			// s.createSQLQuery("SELECT * FROM book").addEntity("Book").list();
 		};
 
 		@Override
@@ -51,6 +53,9 @@ public class LibraryTest extends AbstractActionTest {
 			path = path.replaceAll("\\.", "/").substring(0, path.length() - 5) + "/library.ecore";
 			final Properties props = super.getExtraConfigurationProperties();
 			props.setProperty(HibernateTestStore.EPACKAGE_INIT_MODE, HibernateTestStore.EPACKAGE_INIT_MODE_CLASS);
+			props.setProperty(PersistenceOptions.SQL_FOREIGN_KEY_NAME_PREFIX, "FKPRE_");
+			props.setProperty(PersistenceOptions.SQL_COLUMN_NAME_PREFIX, "COL_");
+			props.setProperty(PersistenceOptions.SQL_TABLE_NAME_PREFIX, "TAB_");
 			return props;
 		}