technofab/dbmate
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/dbmate.git synced 2025-12-12 08:00:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close database if CreateMigrationsTable fails

Browse source
This commit is contained in:
Adrian Macneil 2015-11-30 18:36:19 -08:00
parent 64a1b5b290
commit 7253eb6d54
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
commands.go
View file

@ -160,6 +160,7 @@ func openDatabaseForMigration(ctx *cli.Context) (driver.Driver, *sql.DB, error)
} }
if err := drv.CreateMigrationsTable(db); err != nil { if err := drv.CreateMigrationsTable(db); err != nil {
mustClose(db)
return nil, nil, err return nil, nil, err
} }
@ -179,12 +180,10 @@ func MigrateCommand(ctx *cli.Context) error {
} }
drv, db, err := openDatabaseForMigration(ctx) drv, db, err := openDatabaseForMigration(ctx)
if db != nil {
defer mustClose(db)
}
if err != nil { if err != nil {
return err return err
} }
defer mustClose(db)
applied, err := drv.SelectMigrations(db, -1) applied, err := drv.SelectMigrations(db, -1)
if err != nil { if err != nil {
@ -332,12 +331,10 @@ func parseMigration(path string) (map[string]string, error) {
// RollbackCommand rolls back the most recent migration // RollbackCommand rolls back the most recent migration
func RollbackCommand(ctx *cli.Context) error { func RollbackCommand(ctx *cli.Context) error {
drv, db, err := openDatabaseForMigration(ctx) drv, db, err := openDatabaseForMigration(ctx)
if db != nil {
defer mustClose(db)
}
if err != nil { if err != nil {
return err return err
} }
defer mustClose(db)
applied, err := drv.SelectMigrations(db, 1) applied, err := drv.SelectMigrations(db, 1)
if err != nil { if err != nil {