From d34a819c32a07b754b966e5dbc61c7df30be8d04 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Thu, 28 Dec 2006 09:17:57 +0000
Subject: [PATCH] * split model by table * split seed data by table * updated
 with 3.1.3 changes

---
 db/ddlutils/postgresql/build-ddl.xml          | 40 +++++++++++++++----
 db/ddlutils/postgresql/build.xml              |  2 -
 .../postgresql/jdbc.properties.postgresql     |  4 +-
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/db/ddlutils/postgresql/build-ddl.xml b/db/ddlutils/postgresql/build-ddl.xml
index 37bcd8abbd..7b17fb6dfe 100644
--- a/db/ddlutils/postgresql/build-ddl.xml
+++ b/db/ddlutils/postgresql/build-ddl.xml
@@ -53,8 +53,8 @@
 	<target name="writeSchemaToDb">
 		<ddlToDatabase validatexml="false" usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
 			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
-			<fileset dir="..">
-				<include name="${schemafiles}" />
+			<fileset dir="../model">
+				<include name="**/*.xml" />
 			</fileset>
 
 			<writeschematodatabase alterdatabase="${alterdatabase}" dodrops="true" failonerror="false" />
@@ -64,8 +64,8 @@
 	<target name="writeSchemaSqlToFile">
 		<ddlToDatabase validatexml="false" usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
 			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
-			<fileset dir="..">
-				<include name="${schemafiles}" />
+			<fileset dir="../model">
+				<include name="**/*.xml" />
 			</fileset>
 
 			<writeschemasqltofile alterdatabase="${alterdatabase}" dodrops="false" failonerror="false" createtables="true" createforeignkeys="false" outputfile="${sqloutputfile}" />
@@ -75,8 +75,8 @@
 	<target name="writeFkSqlToFile">
 		<ddlToDatabase validatexml="false" usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
 			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
-			<fileset dir="..">
-				<include name="${schemafiles}" />
+			<fileset dir="../model">
+				<include name="**/*.xml" />
 			</fileset>
 
 			<writeschemasqltofile alterdatabase="${alterdatabase}" dodrops="false" failonerror="false" createtables="false" createforeignkeys="true" outputfile="${fkoutputfile}" />
@@ -99,13 +99,39 @@
 
 
 	<target name="writeDataToDb">
+		<ddlToDatabase usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
+			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
+			<fileset dir="../model">
+				<include name="**/*.xml" />
+			</fileset>
+
+			<writedatatodatabase usebatchmode="true" batchSize="20" ensureForeignKeyOrder="false" >
+				<fileset dir="../data">
+					<include name="**/*.xml" />
+				</fileset>
+			</writedatatodatabase>
+		</ddlToDatabase>
+	</target>
+
+	<target name="splitSchemaFileByTable">
 		<ddlToDatabase usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
 			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
 			<fileset dir="..">
 				<include name="${schemafiles}" />
 			</fileset>
 
-			<writedatatodatabase datafile="${datafile}" usebatchmode="true" batchSize="20" ensureForeignKeyOrder="false" />
+			<splitSchemaFileByTable destination="../model"/>
+		</ddlToDatabase>
+	</target>
+
+	<target name="splitDataFileByTable">
+		<ddlToDatabase usedelimitedsqlidentifiers="${delimitedsqlidentifiers}" catalogpattern="${catalogpattern}" schemapattern="${schemapattern}" databasetype="${platform}">
+			<database driverclassname="${datasource.driverClassName}" url="${datasource.url}" username="${datasource.username}" password="${datasource.password}" />
+			<fileset dir="../model">
+				<include name="**/*.xml" />
+			</fileset>
+
+			<splitDataFileByTable destination="../data" datafile="${datafile}"/>
 		</ddlToDatabase>
 	</target>
 </project>
diff --git a/db/ddlutils/postgresql/build.xml b/db/ddlutils/postgresql/build.xml
index 3d46994d59..a0d9f98ee9 100644
--- a/db/ddlutils/postgresql/build.xml
+++ b/db/ddlutils/postgresql/build.xml
@@ -36,9 +36,7 @@
 	</target>
 	<target name="load-data">
 		<echo message="----- Loading Adempiere Seed data -----" />
-		<unjar src="../adempiere-data.jar" dest=".." />
 		<ant antfile="build-ddl.xml" target="writeDataToDb" />
-		<delete file="../adempiere-data.xml" />
 	</target>
 
 	<target name="load-functions">
diff --git a/db/ddlutils/postgresql/jdbc.properties.postgresql b/db/ddlutils/postgresql/jdbc.properties.postgresql
index 8fc825fd0d..bf3deacfbf 100644
--- a/db/ddlutils/postgresql/jdbc.properties.postgresql
+++ b/db/ddlutils/postgresql/jdbc.properties.postgresql
@@ -31,4 +31,6 @@ datasource.password=adempiere1
 # additional properties for the pooling datasource:
 #datasource.dataSourceName=pooling datasource
 #datasource.initialConnections=5
-#datasource.maxConnections=20
\ No newline at end of file
+#datasource.maxConnections=20
+
+ddlutils.schema=adempiere
\ No newline at end of file