Skip to content
Snippets Groups Projects
Commit 0ebc121e41ca authored by Christophe de Vienne's avatar Christophe de Vienne
Browse files

move the migration source to the migration package so it is accessible to packages outside cmd

parent 2f75d76afdfa
No related branches found
No related tags found
No related merge requests found
Pipeline #6299 passed
......@@ -10,17 +10,6 @@
"{{ joinFilePath .TargetImportPath "migration" }}"
)
func initMigrationSource() source.Driver {
s := bindata.Resource(migration.AssetNames(), migration.Asset)
source, err := bindata.WithInstance(s)
if err != nil {
panic(err)
}
return source
}
var migrationSource = initMigrationSource()
// NewMigrateCmd instanciates a MigrateCmd
func NewMigrateCmd(dbOptions *database.Options, loggingOptions *orusapi.LoggingOptions) *MigrateCmd {
return &MigrateCmd{
......@@ -39,7 +28,7 @@
func (cmd *MigrateCmd) Execute([]string) error {
cmd.log.SetMinLoggingLevel(zerolog.InfoLevel)
log := cmd.log.Logger()
m, err := database.NewMigrate(cmd.db.DSN, migrationSource)
m, err := database.NewMigrate(cmd.db.DSN, migration.Source)
if err != nil {
return fmt.Errorf("failed to init migration engine: %s", err)
}
......
......@@ -41,7 +41,7 @@
// Execute setup a server and runs it
func (cmd *ServeCmd) Execute([]string) error {
if cmd.AutoMigrate {
if err := database.AutoMigrate(DatabaseOptions.DSN, migrationSource, Logger); err != nil {
if err := database.AutoMigrate(DatabaseOptions.DSN, migration.Source, Logger); err != nil {
return err
}
} else {
......@@ -45,7 +45,7 @@
return err
}
} else {
if err := database.IsUptodate(DatabaseOptions.DSN, migrationSource); err != nil {
if err := database.IsUptodate(DatabaseOptions.DSN, migration.Source); err != nil {
return err
}
}
......
......@@ -2,5 +2,10 @@
package migration
import (
"github.com/golang-migrate/migrate/v4/source"
bindata "github.com/golang-migrate/migrate/v4/source/go_bindata"
)
//go:generate go-bindata -pkg migration -prefix scripts scripts
//go:generate sed -i "1s;^;// Code generated by go-bindata. DO NOT EDIT.\\n\\n;" bindata.go
......@@ -5,2 +10,13 @@
//go:generate go-bindata -pkg migration -prefix scripts scripts
//go:generate sed -i "1s;^;// Code generated by go-bindata. DO NOT EDIT.\\n\\n;" bindata.go
func initSource() source.Driver {
s := bindata.Resource(AssetNames(), Asset)
source, err := bindata.WithInstance(s)
if err != nil {
panic(err)
}
return source
}
var Source = initSource()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment