diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-08-17 17:26:21 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-08-17 17:26:21 +0100 |
| commit | d5d6ad406f47ae738a7f6b1699b3b6e7ef916bb9 (patch) | |
| tree | 44df2eaf48eca66023023569d4ba8d901d800226 /internal/db/bundb/statusbookmark.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/statusbookmark.go')
| -rw-r--r-- | internal/db/bundb/statusbookmark.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/db/bundb/statusbookmark.go b/internal/db/bundb/statusbookmark.go index 8a3c4dad6..742c13966 100644 --- a/internal/db/bundb/statusbookmark.go +++ b/internal/db/bundb/statusbookmark.go @@ -29,7 +29,7 @@ import ( ) type statusBookmarkDB struct { - db *WrappedDB + db *DB state *state.State } @@ -42,7 +42,7 @@ func (s *statusBookmarkDB) GetStatusBookmark(ctx context.Context, id string) (*g Where("? = ?", bun.Ident("status_bookmark.id"), id). Scan(ctx) if err != nil { - return nil, s.db.ProcessError(err) + return nil, err } bookmark.Account, err = s.state.DB.GetAccountByID(ctx, bookmark.AccountID) @@ -75,7 +75,7 @@ func (s *statusBookmarkDB) GetStatusBookmarkID(ctx context.Context, accountID st Limit(1) if err := q.Scan(ctx, &id); err != nil { - return "", s.db.ProcessError(err) + return "", err } return id, nil @@ -114,7 +114,7 @@ func (s *statusBookmarkDB) GetStatusBookmarks(ctx context.Context, accountID str } if err := q.Scan(ctx, &ids); err != nil { - return nil, s.db.ProcessError(err) + return nil, err } bookmarks := make([]*gtsmodel.StatusBookmark, 0, len(ids)) @@ -138,7 +138,7 @@ func (s *statusBookmarkDB) PutStatusBookmark(ctx context.Context, statusBookmark Model(statusBookmark). Exec(ctx) - return s.db.ProcessError(err) + return err } func (s *statusBookmarkDB) DeleteStatusBookmark(ctx context.Context, id string) error { @@ -148,7 +148,7 @@ func (s *statusBookmarkDB) DeleteStatusBookmark(ctx context.Context, id string) Where("? = ?", bun.Ident("status_bookmark.id"), id). Exec(ctx) - return s.db.ProcessError(err) + return err } func (s *statusBookmarkDB) DeleteStatusBookmarks(ctx context.Context, targetAccountID string, originAccountID string) error { @@ -173,7 +173,7 @@ func (s *statusBookmarkDB) DeleteStatusBookmarks(ctx context.Context, targetAcco } if _, err := q.Exec(ctx); err != nil { - return s.db.ProcessError(err) + return err } return nil @@ -190,7 +190,7 @@ func (s *statusBookmarkDB) DeleteStatusBookmarksForStatus(ctx context.Context, s Where("? = ?", bun.Ident("status_bookmark.status_id"), statusID) if _, err := q.Exec(ctx); err != nil { - return s.db.ProcessError(err) + return err } return nil |