From 9afa8fa65cc9bcc0b344776c51234a36fa5655c3 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 2 Nov 2021 21:11:21 +0800 Subject: [PATCH 1/2] Fix database keyword quote problem on migration v161 --- models/migrations/v161.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/migrations/v161.go b/models/migrations/v161.go index 4ca9f01218725..6e84132e1b99a 100644 --- a/models/migrations/v161.go +++ b/models/migrations/v161.go @@ -41,7 +41,7 @@ func convertTaskTypeToString(x *xorm.Engine) error { } for i, s := range hookTaskTypes { - if _, err := x.Exec("UPDATE hook_task set typ = ? where type=?", s, i); err != nil { + if _, err := x.Exec("UPDATE hook_task set typ = ? where `type`=?", s, i); err != nil { return err } } From a3edde18f0242d54ae47e1d4ae588f969aacde43 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 2 Nov 2021 21:56:23 +0800 Subject: [PATCH 2/2] support rerun migration v161 --- models/migrations/v161.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/models/migrations/v161.go b/models/migrations/v161.go index 6e84132e1b99a..283c44464c97a 100644 --- a/models/migrations/v161.go +++ b/models/migrations/v161.go @@ -5,6 +5,8 @@ package migrations import ( + "context" + "xorm.io/xorm" ) @@ -40,6 +42,15 @@ func convertTaskTypeToString(x *xorm.Engine) error { return err } + // to keep the migration could be rerun + exist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "hook_task", "type") + if err != nil { + return err + } + if !exist { + return nil + } + for i, s := range hookTaskTypes { if _, err := x.Exec("UPDATE hook_task set typ = ? where `type`=?", s, i); err != nil { return err