From 99fc04b763d3d468e290f3b25a493dbd38b7cbc8 Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 4 Apr 2025 03:30:19 +0000 Subject: [PATCH] fix: make installing Forgejo work again (#7452) - The default engine is no longer guaranteed to be of the type `*xorm.Engine`, so instead return the interface `db.Engine`. - Regression of forgejo/forgejo#7212 # Testing 1. Install a Forgejo instance via the setup screen. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7452 Reviewed-by: Earl Warren Co-authored-by: Gusted Co-committed-by: Gusted --- models/db/install/db.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/models/db/install/db.go b/models/db/install/db.go index 104a7a8e39..e64e85cf01 100644 --- a/models/db/install/db.go +++ b/models/db/install/db.go @@ -6,12 +6,10 @@ package install import ( "forgejo.org/models/db" "forgejo.org/modules/setting" - - "xorm.io/xorm" ) -func getXORMEngine() *xorm.Engine { - return db.DefaultContext.(*db.Context).Engine().(*xorm.Engine) +func getXORMEngine() db.Engine { + return db.DefaultContext.(*db.Context).Engine() } // CheckDatabaseConnection checks the database connection