GOMODULES/goose
1
0
Fork 0
mirror of https://github.com/pressly/goose.git synced 2025-05-31 11:42:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

RunMigrations(): api cleanup, return an error rather than aborting

Browse Source
This commit is contained in:
Liam Staskawicz 2013-09-30 15:29:52 -07:00
parent e5a160a313
commit bf8be62073
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/goose/cmd_down.go
View File

@ -29,7 +29,9 @@ func downRun(cmd *Command, args ...string) {
log.Fatal(err)
}
goose.RunMigrations(conf, conf.MigrationsDir, previous)
if err = goose.RunMigrations(conf, conf.MigrationsDir, previous); err != nil {
log.Fatal(err)
}
}
func init() {

9
cmd/goose/cmd_redo.go
View File

@ -28,8 +28,13 @@ func redoRun(cmd *Command, args ...string) {
log.Fatal(err)
}
goose.RunMigrations(conf, conf.MigrationsDir, previous)
goose.RunMigrations(conf, conf.MigrationsDir, current)
if err := goose.RunMigrations(conf, conf.MigrationsDir, previous); err != nil {
log.Fatal(err)
}
if err := goose.RunMigrations(conf, conf.MigrationsDir, current); err != nil {
log.Fatal(err)
}
}
func init() {

4
cmd/goose/cmd_up.go
View File

@ -24,7 +24,9 @@ func upRun(cmd *Command, args ...string) {
log.Fatal(err)
}
goose.RunMigrations(conf, conf.MigrationsDir, target)
if err := goose.RunMigrations(conf, conf.MigrationsDir, target); err != nil {
log.Fatal(err)
}
}
func init() {

26
lib/goose/migrate.go
View File

@ -45,27 +45,27 @@ type MigrationMap struct {
Direction bool // sort direction: true -> Up, false -> Down
}
func RunMigrations(conf *DBConf, migrationsDir string, target int64) {
func RunMigrations(conf *DBConf, migrationsDir string, target int64) (err error) {
db, err := sql.Open(conf.Driver.Name, conf.Driver.OpenStr)
if err != nil {
log.Fatal("couldn't open DB:", err)
return err
}
defer db.Close()
current, e := EnsureDBVersion(conf, db)
if e != nil {
log.Fatalf("couldn't get DB version: %v", e)
current, err := EnsureDBVersion(conf, db)
if err != nil {
return err
}
mm, err := CollectMigrations(migrationsDir, current, target)
if err != nil {
log.Fatal(err)
return err
}
if len(mm.Migrations) == 0 {
fmt.Printf("goose: no migrations to run. current version: %d\n", current)
return
return nil
}
mm.Sort(current < target)
@ -75,21 +75,21 @@ func RunMigrations(conf *DBConf, migrationsDir string, target int64) {
for _, m := range mm.Migrations {
var e error
switch filepath.Ext(m.Source) {
case ".go":
e = runGoMigration(conf, m.Source, m.Version, mm.Direction)
err = runGoMigration(conf, m.Source, m.Version, mm.Direction)
case ".sql":
e = runSQLMigration(conf, db, m.Source, m.Version, mm.Direction)
err = runSQLMigration(conf, db, m.Source, m.Version, mm.Direction)
}
if e != nil {
log.Fatalf("FAIL %v, quitting migration", e)
if err != nil {
return errors.New(fmt.Sprintf("FAIL %v, quitting migration", err))
}
fmt.Println("OK ", filepath.Base(m.Source))
}
return nil
}
// collect all the valid looking migration scripts in the