From 92ebabe568959d213a83cc1dc26ce0930c9ce944 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Tue, 23 Sep 2025 08:53:53 +0200 Subject: [PATCH] Ensure columns to drop exists in forges migration (#5539) --- server/store/datastore/migration/027_fix_forge_columns.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/store/datastore/migration/027_fix_forge_columns.go b/server/store/datastore/migration/027_fix_forge_columns.go index 51b2db3fa..cfb8897d7 100644 --- a/server/store/datastore/migration/027_fix_forge_columns.go +++ b/server/store/datastore/migration/027_fix_forge_columns.go @@ -23,6 +23,8 @@ var fixForgeColumns = xormigrate.Migration{ ID: "fix-forge-columns", MigrateSession: func(sess *xorm.Session) (err error) { type forges struct { + Client string `xorm:"VARCHAR(250) 'client'"` + ClientSecret string `xorm:"VARCHAR(250) 'client_secret'"` OAuthClientID string `xorm:"VARCHAR(250) 'o_auth_client_i_d'"` OAuthClientSecret string `xorm:"VARCHAR(250) 'o_auth_client_secret'"` } @@ -41,10 +43,6 @@ var fixForgeColumns = xormigrate.Migration{ } // Drop client and client_secret columns if they still exist - if err := dropTableColumns(sess, "forges", "client", "client_secret"); err != nil { - return err - } - - return nil + return dropTableColumns(sess, "forges", "client", "client_secret") }, }