diff options
author | zeripath <art27@cantab.net> | 2020-11-10 22:37:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-10 22:37:11 +0000 |
commit | 3fd060eb37085df9b075baf23f3c315b92c1073e (patch) | |
tree | 58659f779495b8cbfa2cf576d654dbd490fe09c5 /models/migrations | |
parent | 3400928f7ac1fe8326a69a049a5c0b2dc3a3675d (diff) | |
download | gitea-3fd060eb37085df9b075baf23f3c315b92c1073e.tar.gz gitea-3fd060eb37085df9b075baf23f3c315b92c1073e.zip |
Include OriginalAuthor in Reaction constraint (#13505)
When migrating repositories with reactions with deleted users, the original
author id may be -1. This means that it is possible to end up attempting
to create multiple reactions with the same [ Type, IssueID, CommentID, UserID,
OriginalAuthorID ] thus breaking the constraints.
On SQLite this appears to cause a deadlock but on other dbs this will
cause the migration to fail.
This PR extends the constraint to include the original author username
in the constraint.
Fix #13271
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/migrations')
-rw-r--r-- | models/migrations/migrations.go | 2 | ||||
-rw-r--r-- | models/migrations/v159.go | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 4715f192c1..5a2646474c 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -252,6 +252,8 @@ var migrations = []Migration{ NewMigration("ensure repo topics are up-to-date", fixRepoTopics), // v158 -> v159 NewMigration("code comment replies should have the commitID of the review they are replying to", updateCodeCommentReplies), + // v159 -> v160 + NewMigration("update reactions constraint", updateReactionConstraint), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v159.go b/models/migrations/v159.go new file mode 100644 index 0000000000..68043b9412 --- /dev/null +++ b/models/migrations/v159.go @@ -0,0 +1,38 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package migrations + +import ( + "code.gitea.io/gitea/modules/timeutil" + + "xorm.io/xorm" +) + +func updateReactionConstraint(x *xorm.Engine) error { + // Reaction represents a reactions on issues and comments. + type Reaction struct { + ID int64 `xorm:"pk autoincr"` + Type string `xorm:"INDEX UNIQUE(s) NOT NULL"` + IssueID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"` + CommentID int64 `xorm:"INDEX UNIQUE(s)"` + UserID int64 `xorm:"INDEX UNIQUE(s) NOT NULL"` + OriginalAuthorID int64 `xorm:"INDEX UNIQUE(s) NOT NULL DEFAULT(0)"` + OriginalAuthor string `xorm:"INDEX UNIQUE(s)"` + CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` + } + + sess := x.NewSession() + defer sess.Close() + + if err := sess.Begin(); err != nil { + return err + } + + if err := recreateTable(sess, &Reaction{}); err != nil { + return err + } + + return sess.Commit() +} |