From 7485a272ffbcc045e6002b4bf4ea289ce0a0f3b4 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 23 Jan 2019 13:47:51 +0100
Subject: [PATCH] Revert PG on Travis about drop/create the database

---
 .travis.yml | 4 +---
 GNUmakefile | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c660bb5e..393d0033 100644
--- 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 d8c16202..a04468cb 100755
--- 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
-- 
2.41.0