From 0bc1474e95aa4353351ecc2d743d3b908e32a71f Mon Sep 17 00:00:00 2001 From: Peter Kieltyka <peter.kieltyka@pressly.com> Date: Thu, 9 Jul 2015 16:51:16 -0600 Subject: [PATCH] Fix travis --- mysql/_dumps/Makefile | 2 +- postgresql/_dumps/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/_dumps/Makefile b/mysql/_dumps/Makefile index 07d71f03..8ec8958f 100644 --- a/mysql/_dumps/Makefile +++ b/mysql/_dumps/Makefile @@ -6,7 +6,7 @@ DB_PASSWORD ?= upperio_secret DB_NAME ?= upperio_tests setup: - cat setup.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)" + cat setup.sql | mysql -uroot -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)" reset-db: cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)" diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile index ddf590c8..189977d9 100644 --- a/postgresql/_dumps/Makefile +++ b/postgresql/_dumps/Makefile @@ -6,7 +6,7 @@ DB_PASSWORD ?= upperio_secret DB_NAME ?= upperio_tests setup: - cat setup.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT) - + psql -h$(TEST_HOST) -p$(TEST_PORT) < setup.sql + reset-db: cat structs.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT) -- GitLab