aboutsummaryrefslogtreecommitdiffstats
path: root/models/migrations
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2022-06-05 03:18:50 +0800
committerGitHub <noreply@github.com>2022-06-04 20:18:50 +0100
commit12c742f8dc25e4148c44d1265d119c35f161bf74 (patch)
tree0c35f1de4cf7bdea1dfc8b03468f3616d0c82796 /models/migrations
parent449ea6005fb613212102126ff267f5c16f7c40b8 (diff)
downloadgitea-12c742f8dc25e4148c44d1265d119c35f161bf74.tar.gz
gitea-12c742f8dc25e4148c44d1265d119c35f161bf74.zip
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>
Diffstat (limited to 'models/migrations')
-rw-r--r--models/migrations/v151.go23
-rw-r--r--models/migrations/v165.go10
-rw-r--r--models/migrations/v179.go3
-rw-r--r--models/migrations/v205.go8
4 files changed, 26 insertions, 18 deletions
diff --git a/models/migrations/v151.go b/models/migrations/v151.go
index ba6eee3440..50314d8162 100644
--- a/models/migrations/v151.go
+++ b/models/migrations/v151.go
@@ -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 {
diff --git a/models/migrations/v165.go b/models/migrations/v165.go
index d7df0f07a9..87e1a24f28 100644
--- a/models/migrations/v165.go
+++ b/models/migrations/v165.go
@@ -24,8 +24,9 @@ func convertHookTaskTypeToVarcharAndTrim(x *xorm.Engine) error {
SQLType: schemas.SQLType{
Name: "VARCHAR",
},
- Length: 16,
- Nullable: true, // To keep compatible as nullable
+ Length: 16,
+ Nullable: true, // To keep compatible as nullable
+ DefaultIsEmpty: true,
}); err != nil {
return err
}
@@ -49,8 +50,9 @@ func convertHookTaskTypeToVarcharAndTrim(x *xorm.Engine) error {
SQLType: schemas.SQLType{
Name: "VARCHAR",
},
- Length: 16,
- Nullable: true, // To keep compatible as nullable
+ Length: 16,
+ Nullable: true, // To keep compatible as nullable
+ DefaultIsEmpty: true,
}); err != nil {
return err
}
diff --git a/models/migrations/v179.go b/models/migrations/v179.go
index 735e6b62dd..e6dddef273 100644
--- a/models/migrations/v179.go
+++ b/models/migrations/v179.go
@@ -21,6 +21,7 @@ func convertAvatarURLToText(x *xorm.Engine) error {
SQLType: schemas.SQLType{
Name: schemas.Text,
},
- Nullable: true,
+ Nullable: true,
+ DefaultIsEmpty: true,
})
}
diff --git a/models/migrations/v205.go b/models/migrations/v205.go
index 755cb10245..7aefa0431a 100644
--- a/models/migrations/v205.go
+++ b/models/migrations/v205.go
@@ -23,7 +23,8 @@ func migrateUserPasswordSalt(x *xorm.Engine) error {
},
Length: 32,
// MySQL will like us again.
- Nullable: true,
+ Nullable: true,
+ DefaultIsEmpty: true,
}); err != nil {
return err
}
@@ -33,7 +34,8 @@ func migrateUserPasswordSalt(x *xorm.Engine) error {
SQLType: schemas.SQLType{
Name: "VARCHAR",
},
- Length: 32,
- Nullable: true,
+ Length: 32,
+ Nullable: true,
+ DefaultIsEmpty: true,
})
}