Skip to content

Commit 695e8ae

Browse files
authored
Add primary_key to issue_index (#16813) (#16820)
Backport #16813 Make the group_id a primary key in issue_index. This already has an unique index and therefore is a good candidate for becoming a primary key. This PR also changes all other uses of this table to add the group_id as the primary key. The migration v192 from #16813 has not been backported but Xorm will work fine with non-primary keyed tables. If a user on 1.15 wishes to have the correct schema sooner than 1.16 - they can use gitea doctor recreate-table issue_index and gitea will recreate the table with the primary key. Fix #16802 Signed-off-by: Andrew Thornton art27@cantab.net
1 parent 2148b27 commit 695e8ae

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

models/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
// ResourceIndex represents a resource index which could be used as issue/release and others
1515
// We can create different tables i.e. issue_index, release_index and etc.
1616
type ResourceIndex struct {
17-
GroupID int64 `xorm:"unique"`
17+
GroupID int64 `xorm:"pk"`
1818
MaxIndex int64 `xorm:"index"`
1919
}
2020

models/migrations/v182.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
func addIssueResourceIndexTable(x *xorm.Engine) error {
1212
type ResourceIndex struct {
13-
GroupID int64 `xorm:"index unique(s)"`
14-
MaxIndex int64 `xorm:"index unique(s)"`
13+
GroupID int64 `xorm:"pk"`
14+
MaxIndex int64 `xorm:"index"`
1515
}
1616

1717
sess := x.NewSession()

models/migrations/v182_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ func Test_addIssueResourceIndexTable(t *testing.T) {
3333
}
3434

3535
type ResourceIndex struct {
36-
GroupID int64 `xorm:"index unique(s)"`
37-
MaxIndex int64 `xorm:"index unique(s)"`
36+
GroupID int64 `xorm:"pk"`
37+
MaxIndex int64 `xorm:"index"`
3838
}
3939

4040
var start = 0

0 commit comments

Comments
 (0)