From a48b5d5a5aa437cff0474321962c12b0e045dbf8 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 12 Dec 2016 11:01:54 +0100
Subject: Run migration in test, ready for MySQL

---
 build.xml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 90 insertions(+), 11 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 37b40743..aae076e1 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="wallabag" default="build">
     <target name="build" depends="clean,prepare,phpunit"/>
-    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
-    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
-    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
+    <target name="prepare-mysql" depends="clean,prepare_mysql"/>
+    <target name="prepare-sqlite" depends="clean,prepare_sqlite"/>
+    <target name="prepare-pgsql" depends="clean,prepare_pgsql"/>
 
     <target name="clean" description="Cleanup build artifacts">
         <delete dir="${basedir}/var/cache"/>
@@ -26,11 +26,6 @@
             <arg value="doctrine:schema:create"/>
             <arg value="--env=test"/>
         </exec>
-        <exec executable="php">
-            <arg value="${basedir}/bin/console"/>
-            <arg value="cache:clear"/>
-            <arg value="--env=test"/>
-        </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:fixtures:load"/>
@@ -45,12 +40,40 @@
             <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
             <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
-
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:import"/>
+            <arg value="data/sql/mysql_base.sql"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
     </target>
 
     <target name="db_sqlite" description="Run test for SQLite">
@@ -59,12 +82,40 @@
             <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
             <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
-
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:import"/>
+            <arg value="data/sql/sqlite_base.sql"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
     </target>
 
     <target name="db_pgsql" description="Run test for PostgreSQL">
@@ -73,12 +124,40 @@
             <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
             <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
-
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:import"/>
+            <arg value="data/sql/pgsql_base.sql"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
     </target>
 
     <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">
-- 
cgit v1.2.3


From cafb105681e7f9e3979f3ffef4cef6b65968b8fa Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 12 Dec 2016 11:29:45 +0100
Subject: Manually import file for PostgreSQL

---
 build.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index aae076e1..4adf3403 100644
--- a/build.xml
+++ b/build.xml
@@ -34,7 +34,7 @@
         </exec>
     </target>
 
-    <target name="db_mysql" description="Run test for MySQL">
+    <target name="prepare_mysql" description="Run test for MySQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
             <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
@@ -76,7 +76,7 @@
         </exec>
     </target>
 
-    <target name="db_sqlite" description="Run test for SQLite">
+    <target name="prepare_sqlite" description="Run test for SQLite">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
             <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
@@ -118,7 +118,7 @@
         </exec>
     </target>
 
-    <target name="db_pgsql" description="Run test for PostgreSQL">
+    <target name="prepare_pgsql" description="Run test for PostgreSQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
             <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
@@ -146,11 +146,16 @@
             <arg value="data/sql/pgsql_base.sql"/>
             <arg value="--env=test"/>
         </exec>
-        <exec executable="php">
-            <arg value="${basedir}/bin/console"/>
-            <arg value="doctrine:migrations:migrate"/>
-            <arg value="--no-interaction"/>
-            <arg value="--env=test"/>
+        <exec executable="psql">
+            <!-- psql -h host -d database -U username -f data/sql/pgsql_base.sql -->
+            <arg value="-h"/>
+            <arg value="localhost"/>
+            <arg value="-d"/>
+            <arg value="wallabag_test"/>
+            <arg value="-U"/>
+            <arg value="travis"/>
+            <arg value="-f"/>
+            <arg value="data/sql/pgsql_base.sql"/>
         </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
-- 
cgit v1.2.3


From 81915ad8df5a1aed268508dce71445f99274d18c Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 12 Dec 2016 11:32:20 +0100
Subject: And of course it doesn't work for SQLite

---
 build.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 4adf3403..107e912d 100644
--- a/build.xml
+++ b/build.xml
@@ -98,11 +98,20 @@
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
+        <!--
+            Looks like it doesn't work and generate an error:
+            There is no table with name '/home/jeremy/github/wallabag/app/..wallabag_entry' in the schema.
+
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:database:import"/>
             <arg value="data/sql/sqlite_base.sql"/>
             <arg value="--env=test"/>
+        </exec> -->
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
         </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
-- 
cgit v1.2.3


From bd8db77f5f8a5ee9cc1f2d2b10413292e1844a80 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 12 Dec 2016 11:46:43 +0100
Subject: Remove comment

"The string "--" is not permitted within comments."
---
 build.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 107e912d..c34c7d79 100644
--- a/build.xml
+++ b/build.xml
@@ -98,16 +98,6 @@
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
-        <!--
-            Looks like it doesn't work and generate an error:
-            There is no table with name '/home/jeremy/github/wallabag/app/..wallabag_entry' in the schema.
-
-        <exec executable="php">
-            <arg value="${basedir}/bin/console"/>
-            <arg value="doctrine:database:import"/>
-            <arg value="data/sql/sqlite_base.sql"/>
-            <arg value="--env=test"/>
-        </exec> -->
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:schema:create"/>
@@ -156,7 +146,6 @@
             <arg value="--env=test"/>
         </exec>
         <exec executable="psql">
-            <!-- psql -h host -d database -U username -f data/sql/pgsql_base.sql -->
             <arg value="-h"/>
             <arg value="localhost"/>
             <arg value="-d"/>
-- 
cgit v1.2.3


From d9efa42f6619a0b0784e6e28b9b7f2784b2f71d3 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Mon, 12 Dec 2016 11:55:37 +0100
Subject: fixup! Manually import file for PostgreSQL

---
 build.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index c34c7d79..b5727e62 100644
--- a/build.xml
+++ b/build.xml
@@ -139,12 +139,6 @@
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
-        <exec executable="php">
-            <arg value="${basedir}/bin/console"/>
-            <arg value="doctrine:database:import"/>
-            <arg value="data/sql/pgsql_base.sql"/>
-            <arg value="--env=test"/>
-        </exec>
         <exec executable="psql">
             <arg value="-h"/>
             <arg value="localhost"/>
@@ -155,6 +149,12 @@
             <arg value="-f"/>
             <arg value="data/sql/pgsql_base.sql"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:fixtures:load"/>
-- 
cgit v1.2.3