From 7243e9ef34fac4bd10db3f2eb0584b8905474430 Mon Sep 17 00:00:00 2001 From: Vikram Rangnekar Date: Sat, 28 Sep 2019 20:46:55 -0400 Subject: [PATCH] Fix help message for migrate --- serv/cmd.go | 12 ++++++------ serv/cmd_migrate.go | 16 +++++++++++++++- serv/cmd_seed.go | 4 +++- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/serv/cmd.go b/serv/cmd.go index 8a03716..35ca215 100644 --- a/serv/cmd.go +++ b/serv/cmd.go @@ -77,22 +77,22 @@ func Init() { Destination migration version can be one of the following value types: Migrate to the most recent migration. -e.g. migrate up +e.g. db:migrate up Rollback the most recent migration. -e.g. migrate down +e.g. db:migrate down Migrate to a specific migration. -e.g. migrate 42 +e.g. db:migrate 42 Migrate forward N steps. -e.g. migrate +3 +e.g. db:migrate +3 Migrate backward N steps. -e.g. migrate -2 +e.g. db:migrate -2 Redo previous N steps (migrate backward N steps then forward N steps). -e.g. migrate -+1 +e.g. db:migrate -+1 `, Run: cmdDBMigrate, }) diff --git a/serv/cmd_migrate.go b/serv/cmd_migrate.go index 1591966..8430f84 100644 --- a/serv/cmd_migrate.go +++ b/serv/cmd_migrate.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "path" "path/filepath" "strconv" "strings" @@ -37,7 +38,20 @@ var newMigrationText = `-- Write your migrate up statements here func cmdDBSetup(cmd *cobra.Command, args []string) { cmdDBCreate(cmd, []string{}) cmdDBMigrate(cmd, []string{"up"}) - cmdDBSeed(cmd, []string{}) + + sfile := path.Join(confPath, conf.SeedFile) + _, err := os.Stat(sfile) + + if err == nil { + cmdDBSeed(cmd, []string{}) + return + } + + if os.IsNotExist(err) == false { + logger.Fatal().Err(err).Msgf("unable to check if '%s' exists", sfile) + } + + logger.Warn().Msgf("failed to read seed file '%s'", sfile) } func cmdDBCreate(cmd *cobra.Command, args []string) { diff --git a/serv/cmd_seed.go b/serv/cmd_seed.go index 3aaa35d..27e1fd8 100644 --- a/serv/cmd_seed.go +++ b/serv/cmd_seed.go @@ -30,9 +30,11 @@ func cmdDBSeed(cmd *cobra.Command, args []string) { initCompiler() + sfile := path.Join(confPath, conf.SeedFile) + b, err := ioutil.ReadFile(path.Join(confPath, conf.SeedFile)) if err != nil { - logger.Fatal().Err(err).Msg("failed to read file") + logger.Fatal().Err(err).Msgf("failed to read seed file '%s'", sfile) } vm := goja.New()