Fix wrong warn messages in migration steps (#25475) (#25487)

diff --git a/go.mod b/go.mod
index e92c08836e23bb46e3406e95ceafc617f07cadf0..10c2a90386bf917ac53ded5021cc5b9f65fd2735 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -122,7 +122,7 @@ require (
        mvdan.cc/xurls/v2 v2.4.0
        strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
        xorm.io/builder v0.3.12
-       xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e
+       xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75
 )
 
 require (

diff --git a/go.sum b/go.sum
index 0a3e409690e3befe9eac96ad72faa9af8d91fa2e..5949c283ea2c9c15ea8a0484c0cd9b5b16b6527e 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1923,5 +1923,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:
 xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
 xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
 xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
-xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk=
-xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
+xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75 h1:ReBAlO50dCIXCWF8Gbi0ZRa62AGAwCJNCPaUNUa7JSg=
+xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

diff --git a/models/db/engine.go b/models/db/engine.go
index 56dd209fd78ff7e539e260e97b5013988517a48c..3eb16f8042ddcad9e9d8094b810e45900d84b738 100755 (executable)
--- a/models/db/engine.go
+++ b/models/db/engine.go
@@ -123,7 +123,10 @@ func newXORMEngine() (*xorm.Engine, error) {
 
 // SyncAllTables sync the schemas of all tables, is required by unit test code
 func SyncAllTables() error {
-       return x.StoreEngine("InnoDB").Sync2(tables...)
+       _, err := x.StoreEngine("InnoDB").SyncWithOptions(xorm.SyncOptions{
+               WarnIfDatabaseColumnMissed: true,
+       }, tables...)
+       return err
 }
 
 // InitEngine initializes the xorm.Engine and sets it as db.DefaultContext