From 5775933401b0745e9b318811c62cf8c6f40e9713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Fri, 12 Jun 2015 19:17:07 -0500
Subject: [PATCH] Updating dump scripts for testing along with docker.

---
 mysql/_dumps/Makefile       | 11 ++++++++---
 postgresql/_dumps/Makefile  | 11 ++++++++---
 postgresql/database_test.go |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mysql/_dumps/Makefile b/mysql/_dumps/Makefile
index fb1b4e28..e4d3c10c 100644
--- a/mysql/_dumps/Makefile
+++ b/mysql/_dumps/Makefile
@@ -1,4 +1,9 @@
-TEST_HOST ?= 127.0.0.1
+TEST_HOST   ?= 127.0.0.1
+TEST_PORT   ?= 3306
 
-all:
-	cat structs.sql | mysql -uupperio -pupperio upperio_tests -h$(TEST_HOST)
+DB_USERNAME ?= upperio_tests
+DB_PASSWORD ?= upperio_secret
+DB_NAME     ?= upperio_tests
+
+load:
+	cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" "$(DB_NAME)" -h"$(TEST_HOST)" -p$(TEST_PORT)
diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile
index 83de0013..73176203 100644
--- a/postgresql/_dumps/Makefile
+++ b/postgresql/_dumps/Makefile
@@ -1,4 +1,9 @@
-TEST_HOST ?= 127.0.0.1
+TEST_HOST   ?= 127.0.0.1
+TEST_PORT   ?= 5432
 
-all:
-	cat structs.sql | PGPASSWORD="upperio" psql -Uupperio upperio_tests -h$(TEST_HOST)
+DB_USERNAME ?= upperio_tests
+DB_PASSWORD ?= upperio_secret
+DB_NAME     ?= upperio_tests
+
+load:
+	cat structs.sql | PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT)
diff --git a/postgresql/database_test.go b/postgresql/database_test.go
index 1dc7c3ca..8cf79bd5 100644
--- a/postgresql/database_test.go
+++ b/postgresql/database_test.go
@@ -41,8 +41,8 @@ import (
 
 const (
 	databaseName = "upperio_tests"
-	username     = "upperio"
-	password     = "upperio"
+	username     = "upperio_tests"
+	password     = "upperio_secret"
 )
 
 const (
-- 
GitLab