diff options
-rw-r--r-- | go.mod | 2 | ||||
-rw-r--r-- | go.sum | 4 | ||||
-rw-r--r-- | models/migrations/v1_21/v279.go | 6 | ||||
-rw-r--r-- | models/migrations/v1_22/v284.go | 6 | ||||
-rw-r--r-- | models/migrations/v1_22/v285.go | 6 | ||||
-rw-r--r-- | models/migrations/v1_22/v286.go | 5 | ||||
-rw-r--r-- | models/migrations/v1_22/v289.go | 5 | ||||
-rw-r--r-- | models/migrations/v1_22/v290.go | 9 | ||||
-rw-r--r-- | models/migrations/v1_22/v291.go | 6 |
9 files changed, 39 insertions, 10 deletions
@@ -123,7 +123,7 @@ require ( mvdan.cc/xurls/v2 v2.5.0 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 xorm.io/builder v0.3.13 - xorm.io/xorm v1.3.8 + xorm.io/xorm v1.3.9 ) require ( @@ -1064,5 +1064,5 @@ strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251 h1:mUcz5b3 strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251/go.mod h1:FJGmPh3vz9jSos1L/F91iAgnC/aejc0wIIrF2ZwJxdY= xorm.io/builder v0.3.13 h1:a3jmiVVL19psGeXx8GIurTp7p0IIgqeDmwhcR6BAOAo= xorm.io/builder v0.3.13/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= -xorm.io/xorm v1.3.8 h1:CJmplmWqfSRpLWSPMmqz+so8toBp3m7ehuRehIWedZo= -xorm.io/xorm v1.3.8/go.mod h1:LsCCffeeYp63ssk0pKumP6l96WZcHix7ChpurcLNuMw= +xorm.io/xorm v1.3.9 h1:TUovzS0ko+IQ1XnNLfs5dqK1cJl1H5uHpWbWqAQ04nU= +xorm.io/xorm v1.3.9/go.mod h1:LsCCffeeYp63ssk0pKumP6l96WZcHix7ChpurcLNuMw= diff --git a/models/migrations/v1_21/v279.go b/models/migrations/v1_21/v279.go index 19647225c9..2abd1bbe84 100644 --- a/models/migrations/v1_21/v279.go +++ b/models/migrations/v1_21/v279.go @@ -12,5 +12,9 @@ func AddIndexToActionUserID(x *xorm.Engine) error { UserID int64 `xorm:"INDEX"` } - return x.Sync(new(Action)) + _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreDropIndices: true, + IgnoreConstrains: true, + }, new(Action)) + return err } diff --git a/models/migrations/v1_22/v284.go b/models/migrations/v1_22/v284.go index 1a4c786964..2b95078980 100644 --- a/models/migrations/v1_22/v284.go +++ b/models/migrations/v1_22/v284.go @@ -10,5 +10,9 @@ func AddIgnoreStaleApprovalsColumnToProtectedBranchTable(x *xorm.Engine) error { type ProtectedBranch struct { IgnoreStaleApprovals bool `xorm:"NOT NULL DEFAULT false"` } - return x.Sync(new(ProtectedBranch)) + _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreIndices: true, + IgnoreConstrains: true, + }, new(ProtectedBranch)) + return err } diff --git a/models/migrations/v1_22/v285.go b/models/migrations/v1_22/v285.go index c0dacd40bc..a55cc17c04 100644 --- a/models/migrations/v1_22/v285.go +++ b/models/migrations/v1_22/v285.go @@ -14,5 +14,9 @@ func AddPreviousDurationToActionRun(x *xorm.Engine) error { PreviousDuration time.Duration } - return x.Sync(&ActionRun{}) + _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreIndices: true, + IgnoreConstrains: true, + }, &ActionRun{}) + return err } diff --git a/models/migrations/v1_22/v286.go b/models/migrations/v1_22/v286.go index 6ad669f27c..1fcde33202 100644 --- a/models/migrations/v1_22/v286.go +++ b/models/migrations/v1_22/v286.go @@ -86,7 +86,10 @@ func addObjectFormatNameToRepository(x *xorm.Engine) error { ObjectFormatName string `xorm:"VARCHAR(6) NOT NULL DEFAULT 'sha1'"` } - if err := x.Sync(new(Repository)); err != nil { + if _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreIndices: true, + IgnoreConstrains: true, + }, new(Repository)); err != nil { return err } diff --git a/models/migrations/v1_22/v289.go b/models/migrations/v1_22/v289.go index e2dfc48715..b9941aadd9 100644 --- a/models/migrations/v1_22/v289.go +++ b/models/migrations/v1_22/v289.go @@ -10,7 +10,10 @@ func AddDefaultWikiBranch(x *xorm.Engine) error { ID int64 DefaultWikiBranch string } - if err := x.Sync(&Repository{}); err != nil { + if _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreIndices: true, + IgnoreConstrains: true, + }, &Repository{}); err != nil { return err } _, err := x.Exec("UPDATE `repository` SET default_wiki_branch = 'master' WHERE (default_wiki_branch IS NULL) OR (default_wiki_branch = '')") diff --git a/models/migrations/v1_22/v290.go b/models/migrations/v1_22/v290.go index e9b7f504ba..9c54d4e87c 100644 --- a/models/migrations/v1_22/v290.go +++ b/models/migrations/v1_22/v290.go @@ -13,5 +13,12 @@ type HookTask struct { func AddPayloadVersionToHookTaskTable(x *xorm.Engine) error { // create missing column - return x.Sync(new(HookTask)) + if _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreIndices: true, + IgnoreConstrains: true, + }, new(HookTask)); err != nil { + return err + } + _, err := x.Exec("UPDATE hook_task SET payload_version = 1 WHERE payload_version IS NULL") + return err } diff --git a/models/migrations/v1_22/v291.go b/models/migrations/v1_22/v291.go index 0bfffe5d05..74726fae96 100644 --- a/models/migrations/v1_22/v291.go +++ b/models/migrations/v1_22/v291.go @@ -10,5 +10,9 @@ func AddCommentIDIndexofAttachment(x *xorm.Engine) error { CommentID int64 `xorm:"INDEX"` } - return x.Sync(&Attachment{}) + _, err := x.SyncWithOptions(xorm.SyncOptions{ + IgnoreDropIndices: true, + IgnoreConstrains: true, + }, &Attachment{}) + return err } |