diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-08-31 10:46:15 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-31 11:46:15 +0200 |
| commit | 1ee99fc16583e4cefc46011dbc63ca8ed91d3189 (patch) | |
| tree | 950b661bb7c7b4cdb5057ee824ba75ae15fd3adc /internal/db/bundb/status.go | |
| parent | [chore]: Bump github.com/google/uuid from 1.3.0 to 1.3.1 (#2166) (diff) | |
| download | gotosocial-1ee99fc16583e4cefc46011dbc63ca8ed91d3189.tar.xz | |
[bugfix] wrap bun.Tx to add our own error processing (#2169)
* wrap bun.Tx to add our own error processing
Signed-off-by: kim <grufwub@gmail.com>
* add compile-time check for updateRowError() compatibility with sql.Row, fix wrapTx() not being used properly
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/db/bundb/status.go')
| -rw-r--r-- | internal/db/bundb/status.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go index 0e97d32cc..26f0c1f38 100644 --- a/internal/db/bundb/status.go +++ b/internal/db/bundb/status.go @@ -276,7 +276,7 @@ func (s *statusDB) PutStatus(ctx context.Context, status *gtsmodel.Status) error // It is safe to run this database transaction within cache.Store // as the cache does not attempt a mutex lock until AFTER hook. // - return s.db.RunInTx(ctx, func(tx bun.Tx) error { + return s.db.RunInTx(ctx, func(tx Tx) error { // create links between this status and any emojis it uses for _, i := range status.EmojiIDs { if _, err := tx. @@ -342,7 +342,7 @@ func (s *statusDB) UpdateStatus(ctx context.Context, status *gtsmodel.Status, co // It is safe to run this database transaction within cache.Store // as the cache does not attempt a mutex lock until AFTER hook. // - return s.db.RunInTx(ctx, func(tx bun.Tx) error { + return s.db.RunInTx(ctx, func(tx Tx) error { // create links between this status and any emojis it uses for _, i := range status.EmojiIDs { if _, err := tx. @@ -420,7 +420,7 @@ func (s *statusDB) DeleteStatusByID(ctx context.Context, id string) error { // On return ensure status invalidated from cache. defer s.state.Caches.GTS.Status().Invalidate("ID", id) - return s.db.RunInTx(ctx, func(tx bun.Tx) error { + return s.db.RunInTx(ctx, func(tx Tx) error { // delete links between this status and any emojis it uses if _, err := tx. NewDelete(). |