Fix order by parameter (#19849)

Upgrade builder to v0.3.11
Upgrade xorm to v1.3.1 and fixed some hidden bugs.

Replace #19821
Replace #19834
Included #19850

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Lunny Xiao 2022-06-05 03:18:50 +08:00 committed by GitHub
parent 449ea6005f
commit 12c742f8dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 175 additions and 72 deletions

View file

@ -5,6 +5,7 @@
package migrations
import (
"context"
"fmt"
"strings"
@ -86,21 +87,23 @@ func setDefaultPasswordToArgon2(x *xorm.Engine) error {
}
return x.Sync2(new(User))
}
tempTableName := "tmp_recreate__user"
column.Default = "'argon2'"
createTableSQL, _, err := x.Dialect().CreateTableSQL(context.Background(), x.DB(), table, tempTableName)
if err != nil {
return err
}
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
return err
}
tempTableName := "tmp_recreate__user"
column.Default = "'argon2'"
createTableSQL, _ := x.Dialect().CreateTableSQL(table, tempTableName)
for _, sql := range createTableSQL {
if _, err := sess.Exec(sql); err != nil {
log.Error("Unable to create table %s. Error: %v\n", tempTableName, err, createTableSQL)
return err
}
if _, err := sess.Exec(createTableSQL); err != nil {
log.Error("Unable to create table %s. Error: %v\n", tempTableName, err, createTableSQL)
return err
}
for _, index := range table.Indexes {
if _, err := sess.Exec(x.Dialect().CreateIndexSQL(tempTableName, index)); err != nil {