diff options
author | Lunny Xiao | 2021-12-03 01:12:11 +0800 |
---|---|---|
committer | GitHub | 2021-12-02 18:12:11 +0100 |
commit | 56a3b50136a1cbdd32493328be7f05e60f94c4e5 (patch) | |
tree | b59a01f41571e90d2b00c3a9001629814081cd6c | |
parent | 9a8532d928ef0ef5606227d1774ca7387a3a83d5 (diff) |
Check if column exist before rename if exist, just return with no error (#17870) (#17882)
* Check if column exist before rename if exist, just return with no error
* Also check if errors column exist
* Add comment for migration
* Fix sqlite test
-rw-r--r-- | models/migrations/v184.go | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/models/migrations/v184.go b/models/migrations/v184.go index b7be342b8..97bc72d5d 100644 --- a/models/migrations/v184.go +++ b/models/migrations/v184.go @@ -5,6 +5,7 @@ package migrations import ( + "context" "fmt" "code.gitea.io/gitea/modules/setting" @@ -19,6 +20,22 @@ func renameTaskErrorsToMessage(x *xorm.Engine) error { Status int `xorm:"index"` } + // This migration maybe rerun so that we should check if it has been run + messageExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "message") + if err != nil { + return err + } + + if messageExist { + errorsExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "errors") + if err != nil { + return err + } + if !errorsExist { + return nil + } + } + sess := x.NewSession() defer sess.Close() if err := sess.Begin(); err != nil { @@ -29,6 +46,13 @@ func renameTaskErrorsToMessage(x *xorm.Engine) error { return fmt.Errorf("error on Sync2: %v", err) } + if messageExist { + // if both errors and message exist, drop message at first + if err := dropTableColumns(sess, "task", "message"); err != nil { + return err + } + } + switch { case setting.Database.UseMySQL: if _, err := sess.Exec("ALTER TABLE `task` CHANGE errors message text"); err != nil { |