From f7604dfd9ceb8055a0fc0e90f12e97257f0e71ed Mon Sep 17 00:00:00 2001
From: ppaulis <ppaulis@gmail.com>
Date: Wed, 2 Nov 2016 10:09:27 +0100
Subject: [PATCH] fixed phing targets for db migrations

---
 build.properties                        | 3 ++-
 build.xml                               | 6 +++---
 config/autoload/database.local.php.dist | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.properties b/build.properties
index 2016378..272ff40 100644
--- a/build.properties
+++ b/build.properties
@@ -3,9 +3,10 @@ author.name=Pascal Paulis
 author.email=pascal.paulis@continuousphp.com
 
 db.host=localhost
-db.name=monarc
 db.username=dbuser
 db.password=123
+db.name.core=monarc_core
+db.name.backoffice=monarc_backoffice
 
 dir.bin=./bin
 
diff --git a/build.xml b/build.xml
index 901b16c..353d0cf 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
                     <token key="db.host" value="${db.host}"/>
                     <token key="db.username" value="${db.username}"/>
                     <token key="db.password" value="${db.password}"/>
-                    <token key="db.name" value="${db.name}"/>
+                    <token key="db.name.backoffice" value="${db.name.backoffice}"/>
                 </replacetokens>
             </filterchain>
         </loadfile>
@@ -97,8 +97,8 @@
     </target>
 
     <target name="db-migration" description="Update the database version">
-        <exec command="${project.basedir}/scripts/client-upgrade-db.sh backoffice ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
-        <exec command="${project.basedir}/scripts/client-upgrade-db.sh core ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh backoffice ${db.host} ${db.username} ${db.password} ${db.name.backoffice}" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh core ${db.host} ${db.username} ${db.password} ${db.name.core}" passthru="true"/>
     </target>
 
     <target name="reset-db"
diff --git a/config/autoload/database.local.php.dist b/config/autoload/database.local.php.dist
index 2e30aae..4af123e 100644
--- a/config/autoload/database.local.php.dist
+++ b/config/autoload/database.local.php.dist
@@ -8,7 +8,7 @@ return array(
                     'host' => '@db.host@',
                     'user' => '@db.username@',
                     'password' => '@db.password@',
-                    'dbname' => '@db.name@',
+                    'dbname' => '@db.name.backoffice@',
                 )
             ),
             'orm_cli' => array(
@@ -16,7 +16,7 @@ return array(
                     'host' => '@db.host@',
                     'user' => '@db.username@',
                     'password' => '@db.password@',
-                    'dbname' => '@db.name@',
+                    'dbname' => '@db.name.backoffice@',
                 )
             )
         )