GOMODULES
/
goose
mirror of https://github.com/pressly/goose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migrate: consolidate db openings to use OpenDBFromDBConf()

pull/2/head
Liam Staskawicz 2014-06-05 11:45:59 -07:00
parent f2a7d821af
commit 3e7dc7cfd3
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/goose/cmd_status.go
View File

@ -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)

18
lib/goose/migrate.go
View File

@ -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