From c864a9baeba6ad7f2afbb4edf1c32c299ff11ca3 Mon Sep 17 00:00:00 2001 From: binwiederhier Date: Mon, 2 Mar 2026 19:58:26 -0500 Subject: [PATCH] Put more things in tx --- webpush/store.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/webpush/store.go b/webpush/store.go index ab5c517b..9a93a074 100644 --- a/webpush/store.go +++ b/webpush/store.go @@ -130,12 +130,13 @@ func (s *Store) RemoveSubscriptionsByUserID(userID string) error { // RemoveExpiredSubscriptions removes all subscriptions that have not been updated for a given time period. func (s *Store) RemoveExpiredSubscriptions(expireAfter time.Duration) error { - _, err := s.db.Exec(s.queries.deleteSubscriptionByAge, time.Now().Add(-expireAfter).Unix()) - if err != nil { + return db.ExecTx(s.db, func(tx *sql.Tx) error { + if _, err := tx.Exec(s.queries.deleteSubscriptionByAge, time.Now().Add(-expireAfter).Unix()); err != nil { + return err + } + _, err := tx.Exec(s.queries.deleteSubscriptionTopicWithoutSubscription) return err - } - _, err = s.db.Exec(s.queries.deleteSubscriptionTopicWithoutSubscription) - return err + }) } // SetSubscriptionUpdatedAt updates the updated_at timestamp for a subscription by endpoint. This is