Skip to content

Commit 2cd9d6b

Browse files
authored
Fix wrong warn messages in migration steps (#25475) (#25487)
1 parent 050c38c commit 2cd9d6b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ require (
122122
mvdan.cc/xurls/v2 v2.4.0
123123
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
124124
xorm.io/builder v0.3.12
125-
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e
125+
xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75
126126
)
127127

128128
require (

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1923,5 +1923,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:
19231923
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
19241924
xorm.io/builder v0.3.12 h1:ASZYX7fQmy+o8UJdhlLHSW57JDOkM8DNhcAF5d0LiJM=
19251925
xorm.io/builder v0.3.12/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
1926-
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e h1:d5PY6mwuQK5/7T6VKfFswaKMzLmGTHkJ/ZS7+cUIAjk=
1927-
xorm.io/xorm v1.3.3-0.20230219231735-056cecc97e9e/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=
1926+
xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75 h1:ReBAlO50dCIXCWF8Gbi0ZRa62AGAwCJNCPaUNUa7JSg=
1927+
xorm.io/xorm v1.3.3-0.20230623150031-18f8e7a86c75/go.mod h1:9NbjqdnjX6eyjRRhh01GHm64r6N9shTb/8Ak3YRt8Nw=

models/db/engine.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,10 @@ func newXORMEngine() (*xorm.Engine, error) {
123123

124124
// SyncAllTables sync the schemas of all tables, is required by unit test code
125125
func SyncAllTables() error {
126-
return x.StoreEngine("InnoDB").Sync2(tables...)
126+
_, err := x.StoreEngine("InnoDB").SyncWithOptions(xorm.SyncOptions{
127+
WarnIfDatabaseColumnMissed: true,
128+
}, tables...)
129+
return err
127130
}
128131

129132
// InitEngine initializes the xorm.Engine and sets it as db.DefaultContext

0 commit comments

Comments
 (0)