From e4c76971238d65abceed67cd2478e99d79dfd165 Mon Sep 17 00:00:00 2001 From: Josh Fyne Date: Wed, 29 Jun 2016 15:40:13 -0400 Subject: [PATCH] Re-ordered create arguments, checked for missing create arguments --- create.go | 2 +- goose.go | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/create.go b/create.go index 3a8b9aa..3ce998f 100644 --- a/create.go +++ b/create.go @@ -7,7 +7,7 @@ import ( ) // Create writes a new blank migration file. -func Create(db *sql.DB, name, migrationType, dir string) error { +func Create(db *sql.DB, dir, name, migrationType string) error { path, err := CreateMigration(name, migrationType, dir, time.Now()) if err != nil { return err diff --git a/goose.go b/goose.go index 6fac520..0240bb6 100644 --- a/goose.go +++ b/goose.go @@ -16,7 +16,15 @@ func Run(command string, db *sql.DB, dir string, args ...string) error { return err } case "create": - if err := Create(db, args[0], args[1], dir); err != nil { + if len(args) == 0 { + return fmt.Errorf("create must be of form: goose [OPTIONS] DRIVER DBSTRING create NAME [go|sql]") + } + + migrationType := "go" + if len(args) == 2 { + migrationType = args[1] + } + if err := Create(db, dir, args[0], migrationType); err != nil { return err } case "down":