use GetMasterEngine() everywhere instead of getter.master()

This commit is contained in:
pat-s 2025-03-15 14:59:50 +01:00
parent 9ee0a01acc
commit 80cfed1ac5
4 changed files with 13 additions and 23 deletions

View file

@ -39,10 +39,9 @@ func runMigrate(ctx *cli.Context) error {
if err := db.InitEngineWithMigration(context.Background(), func(engine db.Engine) error {
var e *xorm.Engine
if getter, ok := engine.(interface{ Master() *xorm.Engine }); ok {
e = getter.Master()
} else {
e = engine.(*xorm.Engine)
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
return migrations.Migrate(e)
}); err != nil {

View file

@ -36,7 +36,6 @@ import (
"code.gitea.io/gitea/services/forms"
"code.forgejo.org/go-chi/session"
"xorm.io/xorm"
)
const (
@ -364,13 +363,11 @@ 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 {
var xe *xorm.Engine
if getter, ok := e.(interface{ Master() *xorm.Engine }); ok {
xe = getter.Master()
} else {
xe = e.(*xorm.Engine)
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
return migrations.Migrate(xe)
return migrations.Migrate(engine)
}
if err = db.InitEngineWithMigration(ctx, wrapperMigrate); err != nil {
db.UnsetDefaultEngine()

View file

@ -16,8 +16,6 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"xorm.io/xorm"
)
type consistencyCheck struct {
@ -81,11 +79,9 @@ func genericOrphanCheck(name, subject, refobject, joincond string) consistencyCh
func checkDBConsistency(ctx context.Context, logger log.Logger, autofix bool) error {
// make sure DB version is up-to-date
ensureUpToDateWrapper := func(e db.Engine) error {
var engine *xorm.Engine
if getter, ok := e.(interface{ Master() *xorm.Engine }); ok {
engine = getter.Master()
} else {
engine = e.(*xorm.Engine)
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
return migrations.EnsureUpToDate(engine)
}

View file

@ -279,11 +279,9 @@ func doMigrationTest(t *testing.T, version string) {
setting.InitSQLLoggersForCli(log.INFO)
err := db.InitEngineWithMigration(t.Context(), func(e db.Engine) error {
var engine *xorm.Engine
if eg, ok := e.(interface{ Master() *xorm.Engine }); ok {
engine = eg.Master()
} else {
engine = e.(*xorm.Engine)
engine, err := db.GetMasterEngine(e)
if err != nil {
return err
}
currentEngine = engine
return wrappedMigrate(engine)