From 8d79db6b339c66c846c314a73bf2cc1276bfee07 Mon Sep 17 00:00:00 2001
From: tatarinov <tatarinov@shogo.ru>
Date: Sat, 30 Aug 2014 15:07:56 +0400
Subject: [PATCH] =?UTF-8?q?Enh=20#167:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BF=D0=BE=D0=B4=D1=82=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20?=
 =?UTF-8?q?phing=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=20applySchema=20?=
 =?UTF-8?q?=D0=B8=20applyDump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/db.xml | 86 +++++++++++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 34 deletions(-)

diff --git a/build/db.xml b/build/db.xml
index 1909e318..10f4053b 100644
--- a/build/db.xml
+++ b/build/db.xml
@@ -52,26 +52,35 @@
     <fixSchema file="${dbSchemaLocation}"/>
   </target>
 
-  <target name="applySchema" depends="createDb, dropTablesAll" description="Apply DB schema">
-    <available file="${dbSchemaLocation}" property="schema_exists" value="1"/>
-    <fail unless="schema_exists" message="Schema file does not exist in specified location (${dbSchemaLocation})"/>
+  <target name="applySchema" depends="getDbSettings" description="Apply DB schema">
+    <input propertyName="confirm" defaultValue="n" validArgs="y,n" message="All data will be deleted. Are you sure?"/>
+    <if>
+      <equals arg1="${confirm}" arg2="y"/>
+      <then>
+        <phingcall target="createDb"/>
+        <phingcall target="dropTablesAll"/>
 
-    <copy file="${dbSchemaLocation}" tofile="build/tmp/schemaApplying.sql"/>
-    <prepareSchema file="build/tmp/schemaApplying.sql"/>
-    <changeTablePrefix file="build/tmp/schemaApplying.sql" originalPrefix="argilla_" newPrefix="${db.prefix}"/>
+        <available file="${dbSchemaLocation}" property="schema_exists" value="1"/>
+        <fail unless="schema_exists" message="Schema file does not exist in specified location (${dbSchemaLocation})"/>
 
-    <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname} &lt; build/tmp/schemaApplying.sql"/>
+        <copy file="${dbSchemaLocation}" tofile="build/tmp/schemaApplying.sql"/>
+        <prepareSchema file="build/tmp/schemaApplying.sql"/>
+        <changeTablePrefix file="build/tmp/schemaApplying.sql" originalPrefix="argilla_" newPrefix="${db.prefix}"/>
 
-    <input propertyName="applyForTestBase" defaultValue="y">Apply schema for tests' DB?</input>
-    <if>
-      <equals arg1="${applyForTestBase}" arg2="y"/>
-      <then>
-        <phingcall target="createDbTest"/>
-        <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname}_test &lt; build/tmp/schemaApplying.sql"/>
+        <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname} &lt; build/tmp/schemaApplying.sql"/>
+
+        <input propertyName="applyForTestBase" defaultValue="y" validArgs="y,n" message="Apply schema for tests' DB?"/>
+        <if>
+          <equals arg1="${applyForTestBase}" arg2="y"/>
+          <then>
+            <phingcall target="createDbTest"/>
+            <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname}_test &lt; build/tmp/schemaApplying.sql"/>
+          </then>
+        </if>
+
+        <phingcall target="clean"/>
       </then>
     </if>
-
-    <phingcall target="clean"/>
   </target>
 
   <target name="migrate" description="Apply migrations">
@@ -81,31 +90,40 @@
     <exec command="protected/yiic migrate" passthru="true"/>
   </target>
 
-  <target name="applyDump" depends="createDb, dropTablesAll" description="Apply DB dump">
-    <echo message="${db.prefix}"/>
-
-    <php expression="str_replace('.sql/', '', implode('  ', glob('.sql/*')))" returnProperty="fileList"/>
-    <echo message="${fileList}"/>
-    <input message="Enter dump filename" defaultValue="${db.dbname}.sql" propertyName="dumpFileName"/>
-
-    <available file="${sqlFolder}/${dumpFileName}" property="dump_exists" value="1"/>
-    <fail unless="dump_exists" message="Dump file does not exists in specified location (${sqlFolder}/${dumpFileName})"/>
-    <echo message="Dealing with dump '${sqlFolder}/${dumpFileName}', database '${db.dbname}'..."/>
-    <input propertyName="applySure" defaultValue="y">Are you sure?</input>
+  <target name="applyDump" depends="getDbSettings" description="Apply DB dump">
+    <input propertyName="confirm" defaultValue="n" validArgs="y,n" message="All data will be deleted. Are you sure?"/>
     <if>
-      <equals arg1="${applySure}" arg2="y"/>
+    <equals arg1="${confirm}" arg2="y"/>
       <then>
-        <copy file="${sqlFolder}/${dumpFileName}" tofile="build/tmp/dumpApplying.sql"/>
+        <phingcall target="createDb"/>
+        <phingcall target="dropTablesAll"/>
 
-        <echo message="Preparing dump file..."/>
-        <prepareDump file="build/tmp/dumpApplying.sql"/>
+        <echo message="${db.prefix}"/>
 
-        <changeTablePrefix file="build/tmp/dumpApplying.sql" newPrefix="${db.prefix}"/>
+        <php expression="str_replace('.sql/', '', implode('  ', glob('.sql/*')))" returnProperty="fileList"/>
+        <echo message="${fileList}"/>
+        <input message="Enter dump filename" defaultValue="${db.dbname}.sql" propertyName="dumpFileName"/>
 
-        <echo message="Inserting into mysql..."/>
-        <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname} &lt; build/tmp/dumpApplying.sql"/>
+        <available file="${sqlFolder}/${dumpFileName}" property="dump_exists" value="1"/>
+        <fail unless="dump_exists" message="Dump file does not exists in specified location (${sqlFolder}/${dumpFileName})"/>
+        <echo message="Dealing with dump '${sqlFolder}/${dumpFileName}', database '${db.dbname}'..."/>
+        <input propertyName="applySure" defaultValue="y" message="Are you sure?"/>
+        <if>
+          <equals arg1="${applySure}" arg2="y"/>
+          <then>
+            <copy file="${sqlFolder}/${dumpFileName}" tofile="build/tmp/dumpApplying.sql"/>
 
-        <phingcall target="clean"/>
+            <echo message="Preparing dump file..."/>
+            <prepareDump file="build/tmp/dumpApplying.sql"/>
+
+            <changeTablePrefix file="build/tmp/dumpApplying.sql" newPrefix="${db.prefix}"/>
+
+            <echo message="Inserting into mysql..."/>
+            <exec checkreturn="true" passthru="true" command="mysql -u${db.username} -p${db.password} -h${db.host} ${db.dbname} &lt; build/tmp/dumpApplying.sql"/>
+
+            <phingcall target="clean"/>
+          </then>
+        </if>
       </then>
     </if>
   </target>