Merge pull request #516 from uptrace/fix/soft-delete-force

fix: fix ForceDelete on live/undeleted rows
uptrace · Apr 20, 2022 · f010b1d · f010b1d
2 parents 5b63742 + 1a33250
commit f010b1d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/internal/dbtest/soft_delete_test.go b/internal/dbtest/soft_delete_test.go
@@ -20,6 +20,7 @@ func TestSoftDelete(t *testing.T) {
 		{run: testSoftDeleteNilModel},
 		{run: testSoftDeleteAPI},
 		{run: testSoftDeleteBulk},
+		{run: testSoftDeleteForce},
 	}
 	testEachDB(t, func(t *testing.T, dbName string, db *bun.DB) {
 		for _, test := range tests {
@@ -104,6 +105,26 @@ func testSoftDeleteAPI(t *testing.T, db *bun.DB) {
 	require.Equal(t, 0, count)
 }
 
+func testSoftDeleteForce(t *testing.T, db *bun.DB) {
+	ctx := context.Background()
+
+	err := db.ResetModel(ctx, (*Video)(nil))
+	require.NoError(t, err)
+
+	video1 := &Video{
+		ID: 1,
+	}
+	_, err = db.NewInsert().Model(video1).Exec(ctx)
+	require.NoError(t, err)
+
+	_, err = db.NewDelete().Model(video1).WherePK().ForceDelete().Exec(ctx)
+	require.NoError(t, err)
+
+	count, err := db.NewSelect().Model((*Video)(nil)).WhereAllWithDeleted().Count(ctx)
+	require.NoError(t, err)
+	require.Equal(t, 0, count)
+}
+
 func testSoftDeleteBulk(t *testing.T, db *bun.DB) {
 	ctx := context.Background()
 

diff --git a/query_base.go b/query_base.go
@@ -227,13 +227,14 @@ func (q *baseQuery) whereAllWithDeleted() {
 		q.setErr(err)
 		return
 	}
-	q.flags = q.flags.Set(allWithDeletedFlag)
-	q.flags = q.flags.Remove(deletedFlag)
+	q.flags = q.flags.Set(allWithDeletedFlag).Remove(deletedFlag)
 }
 
 func (q *baseQuery) isSoftDelete() bool {
 	if q.table != nil {
-		return q.table.SoftDeleteField != nil && !q.flags.Has(allWithDeletedFlag)
+		return q.table.SoftDeleteField != nil &&
+			!q.flags.Has(allWithDeletedFlag) &&
+			!q.flags.Has(forceDeleteFlag)
 	}
 	return false
 }