diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue_comment.go | 12 | ||||
| -rw-r--r-- | models/migrations/migrations.go | 2 | ||||
| -rw-r--r-- | models/migrations/v158.go | 78 |
3 files changed, 0 insertions, 92 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index 7bcea40b93..a7e9c049bf 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -712,7 +712,6 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err RefAction: opts.RefAction, RefIsPull: opts.RefIsPull, IsForcePush: opts.IsForcePush, - Invalidated: opts.Invalidated, } if _, err = e.Insert(comment); err != nil { return nil, err @@ -879,7 +878,6 @@ type CreateCommentOptions struct { RefAction references.XRefAction RefIsPull bool IsForcePush bool - Invalidated bool } // CreateComment creates comment of issue or commit. @@ -955,8 +953,6 @@ type FindCommentsOptions struct { ReviewID int64 Since int64 Before int64 - Line int64 - TreePath string Type CommentType } @@ -980,12 +976,6 @@ func (opts *FindCommentsOptions) toConds() builder.Cond { if opts.Type != CommentTypeUnknown { cond = cond.And(builder.Eq{"comment.type": opts.Type}) } - if opts.Line > 0 { - cond = cond.And(builder.Eq{"comment.line": opts.Line}) - } - if len(opts.TreePath) > 0 { - cond = cond.And(builder.Eq{"comment.tree_path": opts.TreePath}) - } return cond } @@ -1000,8 +990,6 @@ func findComments(e Engine, opts FindCommentsOptions) ([]*Comment, error) { sess = opts.setSessionPagination(sess) } - // WARNING: If you change this order you will need to fix createCodeComment - return comments, sess. Asc("comment.created_unix"). Asc("comment.id"). diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 4715f192c1..cbf8ae8732 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -250,8 +250,6 @@ var migrations = []Migration{ NewMigration("fix publisher ID for tag releases", fixPublisherIDforTagReleases), // v157 -> v158 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), } // GetCurrentDBVersion returns the current db version diff --git a/models/migrations/v158.go b/models/migrations/v158.go deleted file mode 100644 index d056ffe6dc..0000000000 --- a/models/migrations/v158.go +++ /dev/null @@ -1,78 +0,0 @@ -// 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/log" - - "xorm.io/xorm" -) - -func updateCodeCommentReplies(x *xorm.Engine) error { - type Comment struct { - ID int64 `xorm:"pk autoincr"` - CommitSHA string `xorm:"VARCHAR(40)"` - Patch string `xorm:"TEXT patch"` - Invalidated bool - - // Not extracted but used in the below query - Type int `xorm:"INDEX"` - Line int64 // - previous line / + proposed line - TreePath string - ReviewID int64 `xorm:"index"` - } - - if err := x.Sync2(new(Comment)); err != nil { - return err - } - - sess := x.NewSession() - defer sess.Close() - if err := sess.Begin(); err != nil { - return err - } - - var start = 0 - var batchSize = 100 - for { - var comments = make([]*Comment, 0, batchSize) - if err := sess.SQL(`SELECT comment.id as id, first.commit_sha as commit_sha, first.patch as patch, first.invalidated as invalidated - FROM comment INNER JOIN ( - SELECT C.id, C.review_id, C.line, C.tree_path, C.patch, C.commit_sha, C.invalidated - FROM comment AS C - WHERE C.type = 21 - AND C.created_unix = - (SELECT MIN(comment.created_unix) - FROM comment - WHERE comment.review_id = C.review_id - AND comment.type = 21 - AND comment.line = C.line - AND comment.tree_path = C.tree_path) - ) AS first - ON comment.review_id = first.review_id - AND comment.tree_path = first.tree_path AND comment.line = first.line - WHERE comment.type = 21 - AND comment.id != first.id - AND comment.commit_sha != first.commit_sha`).Limit(batchSize, start).Find(&comments); err != nil { - log.Error("failed to select: %v", err) - return err - } - - for _, comment := range comments { - if _, err := sess.Table("comment").Cols("commit_sha", "patch", "invalidated").Update(comment); err != nil { - log.Error("failed to update comment[%d]: %v %v", comment.ID, comment, err) - return err - } - } - - start += len(comments) - - if len(comments) < batchSize { - break - } - } - - return sess.Commit() -} |