diff options
| author | 2023-08-17 17:26:21 +0100 | |
|---|---|---|
| committer | 2023-08-17 17:26:21 +0100 | |
| commit | d5d6ad406f47ae738a7f6b1699b3b6e7ef916bb9 (patch) | |
| tree | 44df2eaf48eca66023023569d4ba8d901d800226 /internal/db/bundb/tombstone.go | |
| parent | [chore]: Bump github.com/jackc/pgx/v5 from 5.4.2 to 5.4.3 (#2112) (diff) | |
| download | gotosocial-d5d6ad406f47ae738a7f6b1699b3b6e7ef916bb9.tar.xz | |
[bugfix] fix double firing bun.DB query hooks (#2124)
* improve bun.DB wrapping readability + comments, fix double-firing query hooks
* fix incorrect code comment placement
* fix linter issues
* Update internal/db/basic.go
* do as the linter commmands ...
---------
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: Daenney <daenney@users.noreply.github.com>
Diffstat (limited to 'internal/db/bundb/tombstone.go')
| -rw-r--r-- | internal/db/bundb/tombstone.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/db/bundb/tombstone.go b/internal/db/bundb/tombstone.go index 0050e6531..f9882d1c6 100644 --- a/internal/db/bundb/tombstone.go +++ b/internal/db/bundb/tombstone.go @@ -27,7 +27,7 @@ import ( ) type tombstoneDB struct { - db *WrappedDB + db *DB state *state.State } @@ -41,7 +41,7 @@ func (t *tombstoneDB) GetTombstoneByURI(ctx context.Context, uri string) (*gtsmo Where("? = ?", bun.Ident("tombstone.uri"), uri) if err := q.Scan(ctx); err != nil { - return nil, t.db.ProcessError(err) + return nil, err } return &tomb, nil @@ -62,7 +62,7 @@ func (t *tombstoneDB) PutTombstone(ctx context.Context, tombstone *gtsmodel.Tomb NewInsert(). Model(tombstone). Exec(ctx) - return t.db.ProcessError(err) + return err }) } @@ -74,5 +74,5 @@ func (t *tombstoneDB) DeleteTombstone(ctx context.Context, id string) error { TableExpr("? AS ?", bun.Ident("tombstones"), bun.Ident("tombstone")). Where("? = ?", bun.Ident("tombstone.id"), id). Exec(ctx) - return t.db.ProcessError(err) + return err } |
