mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-18 19:38:24 +01:00
Merge pull request '[PORT] gitea#30190: Add unique index for project_issue to prevent duplicate data' (#3096) from gusted/forgejo-gt-30190 into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3096 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Otto <otto@codeberg.org>
This commit is contained in:
commit
7e5cf471a0
5 changed files with 124 additions and 0 deletions
|
@ -0,0 +1,9 @@
|
||||||
|
-
|
||||||
|
id: 1
|
||||||
|
project_id: 1
|
||||||
|
issue_id: 1
|
||||||
|
|
||||||
|
-
|
||||||
|
id: 2
|
||||||
|
project_id: 1
|
||||||
|
issue_id: 1
|
|
@ -22,6 +22,7 @@ import (
|
||||||
"code.gitea.io/gitea/models/migrations/v1_20"
|
"code.gitea.io/gitea/models/migrations/v1_20"
|
||||||
"code.gitea.io/gitea/models/migrations/v1_21"
|
"code.gitea.io/gitea/models/migrations/v1_21"
|
||||||
"code.gitea.io/gitea/models/migrations/v1_22"
|
"code.gitea.io/gitea/models/migrations/v1_22"
|
||||||
|
"code.gitea.io/gitea/models/migrations/v1_23"
|
||||||
"code.gitea.io/gitea/models/migrations/v1_6"
|
"code.gitea.io/gitea/models/migrations/v1_6"
|
||||||
"code.gitea.io/gitea/models/migrations/v1_7"
|
"code.gitea.io/gitea/models/migrations/v1_7"
|
||||||
"code.gitea.io/gitea/models/migrations/v1_8"
|
"code.gitea.io/gitea/models/migrations/v1_8"
|
||||||
|
@ -574,6 +575,10 @@ var migrations = []Migration{
|
||||||
NewMigration("Ensure every project has exactly one default column - No Op", noopMigration),
|
NewMigration("Ensure every project has exactly one default column - No Op", noopMigration),
|
||||||
// v293 -> v294
|
// v293 -> v294
|
||||||
NewMigration("Ensure every project has exactly one default column", v1_22.CheckProjectColumnsConsistency),
|
NewMigration("Ensure every project has exactly one default column", v1_22.CheckProjectColumnsConsistency),
|
||||||
|
|
||||||
|
// Gitea 1.22.0 ends at 294
|
||||||
|
|
||||||
|
NewMigration("Add unique index for project issue table", v1_23.AddUniqueIndexForProjectIssue),
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCurrentDBVersion returns the current db version
|
// GetCurrentDBVersion returns the current db version
|
||||||
|
|
14
models/migrations/v1_23/main_test.go
Normal file
14
models/migrations/v1_23/main_test.go
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package v1_23 //nolint
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/migrations/base"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMain(m *testing.M) {
|
||||||
|
base.MainTest(m)
|
||||||
|
}
|
44
models/migrations/v1_23/v294.go
Normal file
44
models/migrations/v1_23/v294.go
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package v1_23 //nolint
|
||||||
|
|
||||||
|
import (
|
||||||
|
"xorm.io/xorm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AddUniqueIndexForProjectIssue adds unique indexes for project issue table
|
||||||
|
func AddUniqueIndexForProjectIssue(x *xorm.Engine) error {
|
||||||
|
// remove possible duplicated records in table project_issue
|
||||||
|
type result struct {
|
||||||
|
IssueID int64
|
||||||
|
ProjectID int64
|
||||||
|
Cnt int
|
||||||
|
}
|
||||||
|
var results []result
|
||||||
|
if err := x.Select("issue_id, project_id, count(*) as cnt").
|
||||||
|
Table("project_issue").
|
||||||
|
GroupBy("issue_id, project_id").
|
||||||
|
Having("count(*) > 1").
|
||||||
|
Find(&results); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, r := range results {
|
||||||
|
var ids []int64
|
||||||
|
if err := x.SQL("SELECT id FROM project_issue WHERE issue_id = ? and project_id = ? limit ?", r.IssueID, r.ProjectID, r.Cnt-1).Find(&ids); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if _, err := x.Table("project_issue").In("id", ids).Delete(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// add unique index for project_issue table
|
||||||
|
type ProjectIssue struct { //revive:disable-line:exported
|
||||||
|
ID int64 `xorm:"pk autoincr"`
|
||||||
|
IssueID int64 `xorm:"INDEX unique(s)"`
|
||||||
|
ProjectID int64 `xorm:"INDEX unique(s)"`
|
||||||
|
}
|
||||||
|
|
||||||
|
return x.Sync(new(ProjectIssue))
|
||||||
|
}
|
52
models/migrations/v1_23/v294_test.go
Normal file
52
models/migrations/v1_23/v294_test.go
Normal file
|
@ -0,0 +1,52 @@
|
||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package v1_23 //nolint
|
||||||
|
|
||||||
|
import (
|
||||||
|
"slices"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/models/migrations/base"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"xorm.io/xorm/schemas"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_AddUniqueIndexForProjectIssue(t *testing.T) {
|
||||||
|
type ProjectIssue struct { //revive:disable-line:exported
|
||||||
|
ID int64 `xorm:"pk autoincr"`
|
||||||
|
IssueID int64 `xorm:"INDEX"`
|
||||||
|
ProjectID int64 `xorm:"INDEX"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare and load the testing database
|
||||||
|
x, deferable := base.PrepareTestEnv(t, 0, new(ProjectIssue))
|
||||||
|
defer deferable()
|
||||||
|
if x == nil || t.Failed() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
cnt, err := x.Table("project_issue").Where("project_id=1 AND issue_id=1").Count()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.EqualValues(t, 2, cnt)
|
||||||
|
|
||||||
|
assert.NoError(t, AddUniqueIndexForProjectIssue(x))
|
||||||
|
|
||||||
|
cnt, err = x.Table("project_issue").Where("project_id=1 AND issue_id=1").Count()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.EqualValues(t, 1, cnt)
|
||||||
|
|
||||||
|
tables, err := x.DBMetas()
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.EqualValues(t, 1, len(tables))
|
||||||
|
found := false
|
||||||
|
for _, index := range tables[0].Indexes {
|
||||||
|
if index.Type == schemas.UniqueType {
|
||||||
|
found = true
|
||||||
|
slices.Equal(index.Cols, []string{"project_id", "issue_id"})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert.True(t, found)
|
||||||
|
}
|
Loading…
Reference in a new issue