From cefcc7613b0501a74c952edb02fbe884284fcd48 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 30 Apr 2021 23:27:13 +0200
Subject: [PATCH] Fix orphaned objects deletion bug (#15657) (#15682)
* Fix orphaned objects deletion bug
* extend test
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
---
models/consistency.go | 10 +++++++---
models/consistency_test.go | 32 ++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 3 deletions(-)
create mode 100644 models/consistency_test.go
diff --git a/models/consistency.go b/models/consistency.go
index 3a5c4cae50..d8abdd1333 100644
--- a/models/consistency.go
+++ b/models/consistency.go
@@ -297,11 +297,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 0000000000..0a91d9f3da
--- /dev/null
+++ b/models/consistency_test.go
@@ -0,0 +1,32 @@
+// 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())
+
+ 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)
+}