Skip to content

Commit c8602a8

Browse files
authored
Add Index to pull_auto_merge.doer_id (#27811)
Reported at https://codeberg.org/forgejo/forgejo/issues/1677 This column is used by [deleteUser](https://github.com/go-gitea/gitea/blob/f089be91da44ee3e85fbe326a204c7c8a5df3d31/services/user/delete.go#L90). Note: This PR contains a Migration, so we can't backport it to 1.21.
1 parent 0a71013 commit c8602a8

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

models/migrations/migrations.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ var migrations = []Migration{
548548
NewMigration("Rename user themes", v1_22.RenameUserThemes),
549549
// v281 -> v282
550550
NewMigration("Add auth_token table", v1_22.CreateAuthTokenTable),
551+
// v282 -> v283
552+
NewMigration("Add Index to pull_auto_merge.doer_id", v1_22.AddIndexToPullAutoMergeDoerID),
551553
}
552554

553555
// GetCurrentDBVersion returns the current db version

models/migrations/v1_22/v282.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright 2023 The Gitea Authors. All rights reserved.
2+
// SPDX-License-Identifier: MIT
3+
4+
package v1_22 //nolint
5+
6+
import (
7+
"xorm.io/xorm"
8+
)
9+
10+
func AddIndexToPullAutoMergeDoerID(x *xorm.Engine) error {
11+
type PullAutoMerge struct {
12+
DoerID int64 `xorm:"INDEX NOT NULL"`
13+
}
14+
15+
return x.Sync(&PullAutoMerge{})
16+
}

models/pull/automerge.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
type AutoMerge struct {
1818
ID int64 `xorm:"pk autoincr"`
1919
PullID int64 `xorm:"UNIQUE"`
20-
DoerID int64 `xorm:"NOT NULL"`
20+
DoerID int64 `xorm:"INDEX NOT NULL"`
2121
Doer *user_model.User `xorm:"-"`
2222
MergeStyle repo_model.MergeStyle `xorm:"varchar(30)"`
2323
Message string `xorm:"LONGTEXT"`

0 commit comments

Comments
 (0)