Revert PG on Travis about drop/create the database

diff --git a/.travis.yml b/.travis.yml
index c660bb5e529d8f42dce6155b9fa9bc8191f0285f..393d00338e0c0d9a6db67eee08f66f0e64df5302 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,9 +59,7 @@ script:
     - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
 
     - echo "travis_fold:start:prepare"
-    # custom "prepare" for PG because the database should be created with a different user (see "before_script")
-    - if [[ ! $DB = pgsql ]]; then make prepare DB=$DB; fi;
-    - if [[ $DB = pgsql ]]; then make prepare-travis-pg DB=$DB; fi;
+    - make prepare DB=$DB
     - echo "travis_fold:end:prepare"
 
     - make fixtures

diff --git a/GNUmakefile b/GNUmakefile
index d8c16202848e091db22d4e65409125e443db0692..a04468cb1a6a9704440aadb7eb27fdaef0f22fee 100755 (executable)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -25,12 +25,6 @@ run: ## Run the wallabag built-in server
 build: ## Run webpack
        @npm run build:$(ENV)
 
-prepare-travis-pg: ## Custom prepare for Travis & Postgres (do not drop/create the database)
-ifdef DB
-       cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-       php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
 prepare: clean ## Prepare database for testsuite
 ifdef DB
        cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml