From 3e7dc7cfd341b298f5d8577d6419caf5a5055359 Mon Sep 17 00:00:00 2001
From: Liam Staskawicz <liam@stask.net>
Date: Thu, 5 Jun 2014 11:45:59 -0700
Subject: [PATCH] migrate: consolidate db openings to use OpenDBFromDBConf()

---
 cmd/goose/cmd_status.go |  9 +--------
 lib/goose/migrate.go    | 18 ++----------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/cmd/goose/cmd_status.go b/cmd/goose/cmd_status.go
index de672e1..514de26 100644
--- a/cmd/goose/cmd_status.go
+++ b/cmd/goose/cmd_status.go
@@ -37,19 +37,12 @@ func statusRun(cmd *Command, args ...string) {
 		log.Fatal(e)
 	}
 
-	db, e := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
+	db, e := goose.OpenDBFromDBConf(conf)
 	if e != nil {
 		log.Fatal("couldn't open DB:", e)
 	}
 	defer db.Close()
 
-	if conf.Driver.Name == "postgres" {
-		_, err := db.Exec("SET search_path TO " + conf.PgSchema)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
 	// must ensure that the version table exists if we're running on a pristine DB
 	if _, e := goose.EnsureDBVersion(conf, db); e != nil {
 		log.Fatal(e)
diff --git a/lib/goose/migrate.go b/lib/goose/migrate.go
index 66910d3..e687280 100644
--- a/lib/goose/migrate.go
+++ b/lib/goose/migrate.go
@@ -48,19 +48,12 @@ func newMigration(v int64, src string) *Migration {
 
 func RunMigrations(conf *DBConf, migrationsDir string, target int64) (err error) {
 
-	db, err := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
+	db, err := OpenDBFromDBConf(conf)
 	if err != nil {
 		return err
 	}
 	defer db.Close()
 
-	if conf.Driver.Name == "postgres" {
-		_, err := db.Exec("SET search_path TO " + conf.PgSchema)
-		if err != nil {
-			return err
-		}
-	}
-
 	current, err := EnsureDBVersion(conf, db)
 	if err != nil {
 		return err
@@ -269,19 +262,12 @@ func createVersionTable(conf *DBConf, db *sql.DB) error {
 // their own DB instance
 func GetDBVersion(conf *DBConf) (version int64, err error) {
 
-	db, err := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
+	db, err := OpenDBFromDBConf(conf)
 	if err != nil {
 		return -1, err
 	}
 	defer db.Close()
 
-	if conf.Driver.Name == "postgres" {
-		_, err := db.Exec("SET search_path TO " + conf.PgSchema)
-		if err != nil {
-			return -1, err
-		}
-	}
-
 	version, err = EnsureDBVersion(conf, db)
 	if err != nil {
 		return -1, err