[237498]

[237551]

6 files changed, 173 insertions, 4 deletions

diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo
index d01d2beb5..86db42bbe 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_a_o_package.jdo
@@ -22,6 +22,7 @@
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
+				<order column="PTYPE_SUBTYPES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
 			<field name="subNOTypes" persistence-modifier="persistent" delete-action="restrict">
@@ -31,6 +32,7 @@
 				<element>
 					<column name="ptype_subnotypes_id" allows-null="true"/>
 				</element>
+				<order column="PTYPE_SUBNOTYPES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade" name="ptype_subnotypes"/>
 			</field>
 			<field name="infoReferences" persistence-modifier="persistent" delete-action="restrict">
@@ -40,6 +42,7 @@
 				<element>
 					<column name="ptype_inforeferences_id" allows-null="true"/>
 				</element>
+				<order column="PTYPE_INFOREFERENCES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade" name="ptype_inforeferences"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo
index 8b3b7cef6..1e528a613 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.InventoryAction/mysql_s_o_package.jdo
@@ -20,6 +20,7 @@
 				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.inv.impl.PTypeImpl" dependent-element="false">
 					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
 				</collection>
+				<order column="PTYPE_SUBTYPES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade"/>
 			</field>
 			<field name="subNOTypes" persistence-modifier="persistent" delete-action="restrict">
@@ -29,6 +30,7 @@
 				<element>
 					<column name="ptype_subnotypes_id" allows-null="true"/>
 				</element>
+				<order column="PTYPE_SUBNOTYPES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade" name="ptype_subnotypes"/>
 			</field>
 			<field name="infoReferences" persistence-modifier="persistent" delete-action="restrict">
@@ -38,6 +40,7 @@
 				<element>
 					<column name="ptype_inforeferences_id" allows-null="true"/>
 				</element>
+				<order column="PTYPE_INFOREFERENCES_IDX"/>
 				<foreign-key delete-action="restrict" update-action="cascade" name="ptype_inforeferences"/>
 			</field>
 		</class>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_a_o_package.jdo
new file mode 100644
index 000000000..092d4589f
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_a_o_package.jdo
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+
+<jdo>
+	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table">
+				<discriminator column="dtype" strategy="value-map" value="Book"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="title" persistence-modifier="persistent" null-value="exception"/>
+			<field name="pages" persistence-modifier="persistent" null-value="exception"/>
+			<field name="pagesESet" persistence-modifier="persistent"/>
+			<field name="category" persistence-modifier="persistent" null-value="exception" embedded="true"/>
+			<field name="categoryESet" persistence-modifier="persistent"/>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key name="book_author"/>
+				<column name="book_author_e_id" allows-null="true"/>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="library" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table">
+				<discriminator column="dtype" strategy="value-map" value="Library"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="name" persistence-modifier="persistent" null-value="exception"/>
+			<field name="writers" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<element>
+					<column name="library_writers_e_id" allows-null="true"/>
+				</element>
+				<order column="LIBRARY_WRITERS_IDX"/>
+				<foreign-key delete-action="cascade" update-action="cascade" name="library_writers"/>
+			</field>
+			<field name="books" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<element>
+					<column name="library_books_e_id" allows-null="true"/>
+				</element>
+				<order column="LIBRARY_BOOKS_IDX"/>
+				<foreign-key delete-action="cascade" update-action="cascade" name="library_books"/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="writer" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table">
+				<discriminator column="dtype" strategy="value-map" value="Writer"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+			<field name="name" persistence-modifier="persistent" null-value="exception"/>
+			<field name="books" persistence-modifier="persistent" mapped-by="author" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="WRITER_BOOKS_IDX"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+		</class>
+	</package>
+</jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_s_o_package.jdo
new file mode 100644
index 000000000..e2173c79d
--- /dev/null
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction/mysql_s_o_package.jdo
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jdo SYSTEM "file:/javax/jdo/jdo.dtd">
+
+<jdo>
+	<package name="org.eclipse.emf.teneo.samples.emf.sample.library.impl">
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="book" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Book"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="title" persistence-modifier="persistent" null-value="exception"/>
+			<field name="pages" persistence-modifier="persistent" null-value="exception"/>
+			<field name="pagesESet" persistence-modifier="persistent"/>
+			<field name="category" persistence-modifier="persistent" null-value="exception" embedded="true"/>
+			<field name="categoryESet" persistence-modifier="persistent"/>
+			<field name="author" persistence-modifier="persistent" delete-action="restrict" null-value="none">
+				<foreign-key name="book_author"/>
+				<column name="book_author_e_id" allows-null="true"/>
+				<extension vendor-name="jpox" key="implementation-classes" value="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl"/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.LibraryImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="library" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Library"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="name" persistence-modifier="persistent" null-value="exception"/>
+			<field name="writers" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<element>
+					<column name="library_writers_e_id" allows-null="true"/>
+				</element>
+				<order column="LIBRARY_WRITERS_IDX"/>
+				<foreign-key delete-action="cascade" update-action="cascade" name="library_writers"/>
+			</field>
+			<field name="books" persistence-modifier="persistent" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" dependent-element="true">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<element>
+					<column name="library_books_e_id" allows-null="true"/>
+				</element>
+				<order column="LIBRARY_BOOKS_IDX"/>
+				<foreign-key delete-action="cascade" update-action="cascade" name="library_books"/>
+			</field>
+		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.sample.library.impl.WriterImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="writer" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.Writer"/>
+			<implements name="org.eclipse.emf.teneo.samples.emf.sample.library.SerializableEObject"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<implements name="java.io.Serializable"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+			<field name="name" persistence-modifier="persistent" null-value="exception"/>
+			<field name="books" persistence-modifier="persistent" mapped-by="author" delete-action="restrict">
+				<collection element-type="org.eclipse.emf.teneo.samples.emf.sample.library.impl.BookImpl" dependent-element="false">
+					<extension vendor-name="jpox" key="cache-lazy-loading" value="true"/>
+				</collection>
+				<order column="WRITER_BOOKS_IDX"/>
+				<foreign-key delete-action="restrict" update-action="cascade"/>
+			</field>
+		</class>
+	</package>
+</jdo>
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
index 6925efcb6..091e49212 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllGenerateTests.java,v 1.22 2008/04/10 09:20:28 mtaal Exp $
+ * $Id: AllGenerateTests.java,v 1.23 2008/06/28 22:41:42 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -27,6 +27,7 @@ import org.eclipse.emf.teneo.test.emf.sample.ForumAction;
 import org.eclipse.emf.teneo.test.emf.sample.InventoryAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryFKAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction;
+import org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction;
@@ -44,13 +45,15 @@ import org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
  */
 public class AllGenerateTests {
 	public static Test suite() {
 		MultiCfgTestSuite suite =
 				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed.instance()
 					.getConfigurations());
+		suite.addTest(new JPOXGenerateTest(LibraryLargeAction.class));
+
 		suite.addTest(new JPOXGenerateTest(LibraryResourceAction.class));
 
 		suite.addTest(new JPOXGenerateTest(SimpleLibraryResourceAction.class));
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
index c9e16d76b..ec9690252 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllTests.java,v 1.31 2008/05/10 14:13:20 mtaal Exp $
+ * $Id: AllTests.java,v 1.32 2008/06/28 22:41:42 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -27,6 +27,7 @@ import org.eclipse.emf.teneo.test.emf.sample.ForumAction;
 import org.eclipse.emf.teneo.test.emf.sample.InventoryAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryFKAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction;
+import org.eclipse.emf.teneo.test.emf.sample.LibraryLargeAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
 import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceCutPasteAction;
@@ -43,7 +44,7 @@ import org.eclipse.emf.teneo.test.emf.sample.SunBooksAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
  */
 public class AllTests {
 
@@ -51,6 +52,13 @@ public class AllTests {
 		TestSuite suite =
 				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed.instance()
 					.getConfigurations());
+
+		suite.addTestSuite(LibraryLargeAction.class);
+
+		if (true) {
+			return suite;
+		}
+
 		suite.addTestSuite(LibraryResourceAction.class);
 
 		suite.addTestSuite(SimpleLibraryResourceAction.class);