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

dir string before extra args

pull/5/head
Josh Fyne 2016-06-29 14:54:13 -04:00
parent ba86be6db6
commit db38a98723
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/goose/main.go
View File

@ -57,12 +57,12 @@ func main() {
log.Fatalf("-dbstring=%q: %v\n", dbstring, err) log.Fatalf("-dbstring=%q: %v\n", dbstring, err)
} }
arguments := []string{*dir} arguments := []string{}
if len(args) > 3 { if len(args) > 3 {
arguments = append(arguments, 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) log.Fatalf("goose run: %v", err)
} }
} }

7
goose.go
View File

@ -5,10 +5,7 @@ import (
"fmt" "fmt"
) )
func Run(command string, db *sql.DB, args ...string) error { func Run(command string, db *sql.DB, dir string, args ...string) error {
dir := args[0]
additional := args[0:]
switch command { switch command {
case "up": case "up":
if err := Up(db, dir); err != nil { if err := Up(db, dir); err != nil {
@ -19,7 +16,7 @@ func Run(command string, db *sql.DB, args ...string) error {
return err return err
} }
case "create": 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 return err
} }
case "down": case "down":