From 3c1fb1a0f112ed6ee5a8dab8f035e4972510f09b Mon Sep 17 00:00:00 2001 From: kim Date: Mon, 16 Sep 2024 17:18:06 +0100 Subject: [PATCH] don't use ErrNoEntries on delete when not needed (it's only needed for a RETURNING call) --- internal/db/bundb/statusbookmark.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/db/bundb/statusbookmark.go b/internal/db/bundb/statusbookmark.go index 9f92e0795..1534050da 100644 --- a/internal/db/bundb/statusbookmark.go +++ b/internal/db/bundb/statusbookmark.go @@ -303,7 +303,8 @@ func (s *statusBookmarkDB) DeleteStatusBookmarks(ctx context.Context, targetAcco q = q.Where("? = ?", bun.Ident("account_id"), originAccountID) } - if _, err := q.Exec(ctx); err != nil { + if _, err := q.Exec(ctx); err != nil && + !errors.Is(err, db.ErrNoEntries) { return err } @@ -323,7 +324,7 @@ func (s *statusBookmarkDB) DeleteStatusBookmarksForStatus(ctx context.Context, s q := s.db.NewDelete(). TableExpr("? AS ?", bun.Ident("status_bookmarks"), bun.Ident("status_bookmark")). Where("? = ?", bun.Ident("status_bookmark.status_id"), statusID) - if _, err := q.Exec(ctx); err != nil && !errors.Is(err, db.ErrNoEntries) { + if _, err := q.Exec(ctx); err != nil { return err }