Skip to content

Commit 55c51dd

Browse files
committed
Fix break change of xorm
1 parent d372bf6 commit 55c51dd

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

models/migrations/v151.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package migrations
66

77
import (
8+
"context"
89
"fmt"
910
"strings"
1011

@@ -95,7 +96,10 @@ func setDefaultPasswordToArgon2(x *xorm.Engine) error {
9596
tempTableName := "tmp_recreate__user"
9697
column.Default = "'argon2'"
9798

98-
createTableSQL, _ := x.Dialect().CreateTableSQL(table, tempTableName)
99+
createTableSQL, _, err := x.Dialect().CreateTableSQL(context.Background(), x.DB(), table, tempTableName)
100+
if err != nil {
101+
return err
102+
}
99103
for _, sql := range createTableSQL {
100104
if _, err := sess.Exec(sql); err != nil {
101105
log.Error("Unable to create table %s. Error: %v\n", tempTableName, err, createTableSQL)

models/models.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ type Engine interface {
3737
Delete(...interface{}) (int64, error)
3838
Exec(...interface{}) (sql.Result, error)
3939
Find(interface{}, ...interface{}) error
40-
Get(interface{}) (bool, error)
40+
Get(...interface{}) (bool, error)
4141
ID(interface{}) *xorm.Session
4242
In(string, ...interface{}) *xorm.Session
4343
Incr(column string, arg ...interface{}) *xorm.Session

0 commit comments

Comments
 (0)