From 10a2e56df0788b8b115be8391ebc3c90e87240be Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Mon, 12 Nov 2018 13:58:15 +0100 Subject: [PATCH] Fixing absolute path for dir option of migration --- cmd/commands/migrate/migrate.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/commands/migrate/migrate.go b/cmd/commands/migrate/migrate.go index 54be83c..9e699cc 100644 --- a/cmd/commands/migrate/migrate.go +++ b/cmd/commands/migrate/migrate.go @@ -98,11 +98,22 @@ func RunMigration(cmd *commands.Command, args []string) int { } if mDir == "" { mDir = utils.DocValue(config.Conf.Database.Dir) + if mDir == "" { + mDir = utils.DocValue(path.Join(currpath, "database", "migrations")) + } } + beeLogger.Log.Infof("Using '%s' as 'driver'", mDriver) beeLogger.Log.Infof("Using '%s' as 'conn'", mConn) beeLogger.Log.Infof("Using '%s' as 'dir'", mDir) driverStr, connStr, dirStr := string(mDriver), string(mConn), string(mDir) + + dirRune := []rune(dirStr) + + if dirRune[0] != '/' && dirRune[1] != ':' { + dirStr = path.Join(currpath, dirStr) + } + if len(args) == 0 { // run all outstanding migrations beeLogger.Log.Info("Running all outstanding migrations")