From cdb6e8088dc985ea7a6d3e1bed7d9cdb21be8eef Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 29 Apr 2021 13:01:26 +0800 Subject: [PATCH 1/2] Fix orphaned objects deletion bug --- models/consistency.go | 10 +++++++--- models/consistency_test.go | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 models/consistency_test.go diff --git a/models/consistency.go b/models/consistency.go index a1a2bf7bb5fa6..77a8018266e51 100644 --- a/models/consistency.go +++ b/models/consistency.go @@ -296,11 +296,15 @@ func CountOrphanedObjects(subject, refobject, joinCond string) (int64, error) { // DeleteOrphanedObjects delete subjects with have no existing refobject anymore func DeleteOrphanedObjects(subject, refobject, joinCond string) error { - _, err := x.In("id", builder.Select("`"+subject+"`.id"). + subQuery := builder.Select("`"+subject+"`.id"). From("`"+subject+"`"). Join("LEFT", "`"+refobject+"`", joinCond). - Where(builder.IsNull{"`" + refobject + "`.id"})). - Delete("`" + subject + "`") + Where(builder.IsNull{"`" + refobject + "`.id"}) + sql, args, err := builder.Delete(builder.In("id", subQuery)).From("`" + subject + "`").ToSQL() + if err != nil { + return err + } + _, err = x.Exec(append([]interface{}{sql}, args...)...) return err } diff --git a/models/consistency_test.go b/models/consistency_test.go new file mode 100644 index 0000000000000..d42906d9c8307 --- /dev/null +++ b/models/consistency_test.go @@ -0,0 +1,18 @@ +// Copyright 2021 Gitea. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestDeleteOrphanedObjects(t *testing.T) { + assert.NoError(t, PrepareTestDatabase()) + + err := DeleteOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id") + assert.NoError(t, err) +} From bf63993b306ef52d22ccf0defbfc9d75999aeb87 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 30 Apr 2021 18:47:13 +0200 Subject: [PATCH 2/2] extend test --- models/consistency_test.go | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/models/consistency_test.go b/models/consistency_test.go index d42906d9c8307..0a91d9f3dae6e 100644 --- a/models/consistency_test.go +++ b/models/consistency_test.go @@ -13,6 +13,20 @@ import ( func TestDeleteOrphanedObjects(t *testing.T) { assert.NoError(t, PrepareTestDatabase()) - err := DeleteOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id") + countBefore, err := x.Count(&PullRequest{}) assert.NoError(t, err) + + _, err = x.Insert(&PullRequest{IssueID: 1000}, &PullRequest{IssueID: 1001}, &PullRequest{IssueID: 1003}) + assert.NoError(t, err) + + orphaned, err := CountOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id") + assert.NoError(t, err) + assert.EqualValues(t, 3, orphaned) + + err = DeleteOrphanedObjects("pull_request", "issue", "pull_request.issue_id=issue.id") + assert.NoError(t, err) + + countAfter, err := x.Count(&PullRequest{}) + assert.NoError(t, err) + assert.EqualValues(t, countBefore, countAfter) }