chore: move wrapperMigrate to migrations pkg

This commit is contained in:
pat-s 2025-03-27 09:19:08 +01:00
parent 79e1fb2152
commit 46e60dcebb
No known key found for this signature in database
GPG key ID: 3C6318841EF78925
2 changed files with 11 additions and 8 deletions

View file

@ -8,6 +8,7 @@ import (
"context"
"fmt"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/forgejo_migrations"
"code.gitea.io/gitea/models/migrations/v1_10"
"code.gitea.io/gitea/models/migrations/v1_11"
@ -510,3 +511,12 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t
// Execute Forgejo specific migrations.
return forgejo_migrations.Migrate(x)
}
// WrapperMigrate is a wrapper for Migrate to be called in diagnostics
func WrapperMigrate(e db.Engine) error {
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
return Migrate(engine)
}

View file

@ -362,14 +362,7 @@ func SubmitInstall(ctx *context.Context) {
// Init the engine with migration
// Wrap migrations.Migrate into a function of type func(db.Engine) error to fix diagnostics.
wrapperMigrate := func(e db.Engine) error {
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
return migrations.Migrate(engine)
}
if err = db.InitEngineWithMigration(ctx, wrapperMigrate); err != nil {
if err = db.InitEngineWithMigration(ctx, migrations.WrapperMigrate); err != nil {
db.UnsetDefaultEngine()
ctx.Data["Err_DbSetting"] = true
ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form)