From db38a98723c3b5a91086590c4185c9a222b5cb6e Mon Sep 17 00:00:00 2001 From: Josh Fyne Date: Wed, 29 Jun 2016 14:54:13 -0400 Subject: [PATCH] dir string before extra args --- cmd/goose/main.go | 4 ++-- goose.go | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/goose/main.go b/cmd/goose/main.go index ac186c7..1560552 100644 --- a/cmd/goose/main.go +++ b/cmd/goose/main.go @@ -57,12 +57,12 @@ func main() { log.Fatalf("-dbstring=%q: %v\n", dbstring, err) } - arguments := []string{*dir} + arguments := []string{} if len(args) > 3 { arguments = append(arguments, args[3:]...) } - if err := goose.Run(command, db, arguments...); err != nil { + if err := goose.Run(command, db, *dir, arguments...); err != nil { log.Fatalf("goose run: %v", err) } } diff --git a/goose.go b/goose.go index 67b9934..6fac520 100644 --- a/goose.go +++ b/goose.go @@ -5,10 +5,7 @@ import ( "fmt" ) -func Run(command string, db *sql.DB, args ...string) error { - dir := args[0] - additional := args[0:] - +func Run(command string, db *sql.DB, dir string, args ...string) error { switch command { case "up": if err := Up(db, dir); err != nil { @@ -19,7 +16,7 @@ func Run(command string, db *sql.DB, args ...string) error { return err } case "create": - if err := Create(db, additional[0], additional[1], dir); err != nil { + if err := Create(db, args[0], args[1], dir); err != nil { return err } case "down":