From d5d6ad406f47ae738a7f6b1699b3b6e7ef916bb9 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Thu, 17 Aug 2023 17:26:21 +0100 Subject: [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 Co-authored-by: Daenney --- internal/db/bundb/tag.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'internal/db/bundb/tag.go') diff --git a/internal/db/bundb/tag.go b/internal/db/bundb/tag.go index 043af5728..fac621f0a 100644 --- a/internal/db/bundb/tag.go +++ b/internal/db/bundb/tag.go @@ -28,7 +28,7 @@ import ( ) type tagDB struct { - conn *WrappedDB + conn *DB state *state.State } @@ -42,7 +42,7 @@ func (m *tagDB) GetTag(ctx context.Context, id string) (*gtsmodel.Tag, error) { Where("? = ?", bun.Ident("tag.id"), id) if err := q.Scan(ctx); err != nil { - return nil, m.conn.ProcessError(err) + return nil, err } return &tag, nil @@ -63,7 +63,7 @@ func (m *tagDB) GetTagByName(ctx context.Context, name string) (*gtsmodel.Tag, e Where("? = ?", bun.Ident("tag.name"), name) if err := q.Scan(ctx); err != nil { - return nil, m.conn.ProcessError(err) + return nil, err } return &tag, nil @@ -103,7 +103,7 @@ func (m *tagDB) PutTag(ctx context.Context, tag *gtsmodel.Tag) error { // Insert the copy. if err := m.state.Caches.GTS.Tag().Store(t2, func() error { _, err := m.conn.NewInsert().Model(t2).Exec(ctx) - return m.conn.ProcessError(err) + return err }); err != nil { return err // err already processed } -- cgit v1.2.3