From cc0b805a439ca80f4eb26400a0275fd253990bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Wed, 22 Jul 2015 17:13:04 -0500
Subject: [PATCH] Attempt to fix travis by reviewing Makefiles from v2 branch.

---
 mongo/Makefile             | 11 +++++++++++
 mongo/_example/Makefile    |  4 ++++
 mysql/Makefile             |  2 +-
 mysql/_dumps/Makefile      |  9 +++++++--
 postgresql/Makefile        |  2 +-
 postgresql/_dumps/Makefile |  7 ++++++-
 ql/Makefile                |  2 +-
 ql/_dumps/Makefile         |  4 ++--
 ql/database_test.go        |  1 -
 sqlite/Makefile            |  2 +-
 sqlite/_dumps/Makefile     |  2 +-
 11 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 mongo/Makefile
 create mode 100644 mongo/_example/Makefile

diff --git a/mongo/Makefile b/mongo/Makefile
new file mode 100644
index 00000000..e9c58f4b
--- /dev/null
+++ b/mongo/Makefile
@@ -0,0 +1,11 @@
+TEST_HOST ?= 127.0.0.1
+
+build:
+	go build && go install
+
+test:
+	go test -v
+	$(MAKE) -C _example
+
+bench:
+	go test -v -test.bench=. -test.benchtime=10s -benchmem
diff --git a/mongo/_example/Makefile b/mongo/_example/Makefile
new file mode 100644
index 00000000..9ded0fd4
--- /dev/null
+++ b/mongo/_example/Makefile
@@ -0,0 +1,4 @@
+TEST_HOST   ?= 127.0.0.1
+
+test:
+	go run -v main.go
diff --git a/mysql/Makefile b/mysql/Makefile
index 8f8882b0..de66e804 100644
--- a/mysql/Makefile
+++ b/mysql/Makefile
@@ -4,7 +4,7 @@ build:
 	go build && go install
 
 reset-db:
-	$(MAKE) -C _dumps
+	$(MAKE) reset-db -C _dumps
 
 test: reset-db
 	go test -v
diff --git a/mysql/_dumps/Makefile b/mysql/_dumps/Makefile
index 073f8210..933d22b1 100644
--- a/mysql/_dumps/Makefile
+++ b/mysql/_dumps/Makefile
@@ -5,5 +5,10 @@ DB_USERNAME ?= upperio_tests
 DB_PASSWORD ?= upperio_secret
 DB_NAME     ?= upperio_tests
 
-load:
-	cat structs.sql | mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)"
+all: setup reset-db
+
+setup:
+	mysql -uroot -h"$(TEST_HOST)" -P$(TEST_PORT) < setup.sql
+
+reset-db:
+	mysql -u"$(DB_USERNAME)" -p"$(DB_PASSWORD)" -h"$(TEST_HOST)" -P$(TEST_PORT) "$(DB_NAME)" < structs.sql
diff --git a/postgresql/Makefile b/postgresql/Makefile
index 8f8882b0..de66e804 100644
--- a/postgresql/Makefile
+++ b/postgresql/Makefile
@@ -4,7 +4,7 @@ build:
 	go build && go install
 
 reset-db:
-	$(MAKE) -C _dumps
+	$(MAKE) reset-db -C _dumps
 
 test: reset-db
 	go test -v
diff --git a/postgresql/_dumps/Makefile b/postgresql/_dumps/Makefile
index 64253b53..2c8b99c3 100644
--- a/postgresql/_dumps/Makefile
+++ b/postgresql/_dumps/Makefile
@@ -5,5 +5,10 @@ DB_USERNAME ?= upperio_tests
 DB_PASSWORD ?= upperio_secret
 DB_NAME     ?= upperio_tests
 
+all: setup reset-db
+
+setup:
+	psql -Upostgres -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)
+	PGPASSWORD="$(DB_PASSWORD)" psql -U$(DB_USERNAME) $(DB_NAME) -h$(TEST_HOST) -p$(TEST_PORT) < structs.sql
diff --git a/ql/Makefile b/ql/Makefile
index 527a9d7c..48467b98 100644
--- a/ql/Makefile
+++ b/ql/Makefile
@@ -2,7 +2,7 @@ build:
 	go build && go install
 
 reset-db:
-	$(MAKE) -C _dumps
+	$(MAKE) reset-db -C _dumps
 
 test: reset-db
 	go test -v
diff --git a/ql/_dumps/Makefile b/ql/_dumps/Makefile
index 8eb67081..dd60d745 100644
--- a/ql/_dumps/Makefile
+++ b/ql/_dumps/Makefile
@@ -1,7 +1,7 @@
 DB_NAME     ?= test.db
 
-load: clean
-	cat structs.sql | $$GOPATH/bin/ql -db $(DB_NAME)
+reset-db: clean
+	$$GOPATH/bin/ql -db $(DB_NAME) < structs.sql
 
 clean:
 	rm -f $(DB_NAME)
diff --git a/ql/database_test.go b/ql/database_test.go
index 057a5ba8..9c94cb71 100644
--- a/ql/database_test.go
+++ b/ql/database_test.go
@@ -29,7 +29,6 @@ package ql
 // go test
 
 import (
-	"os"
 
 	//"reflect"
 	//"errors"
diff --git a/sqlite/Makefile b/sqlite/Makefile
index 527a9d7c..48467b98 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -2,7 +2,7 @@ build:
 	go build && go install
 
 reset-db:
-	$(MAKE) -C _dumps
+	$(MAKE) reset-db -C _dumps
 
 test: reset-db
 	go test -v
diff --git a/sqlite/_dumps/Makefile b/sqlite/_dumps/Makefile
index 11c70752..ad506a60 100644
--- a/sqlite/_dumps/Makefile
+++ b/sqlite/_dumps/Makefile
@@ -1,7 +1,7 @@
 all: reset-db
 
 reset-db: clean
-	cat structs.sql | sqlite3 gotest.sqlite3.db
+	sqlite3 gotest.sqlite3.db < structs.sql
 
 clean:
 	rm -f gotest.sqlite3.db
-- 
GitLab