From bfccf4e450d22d9a3fc0c58d94ed728207d305e0 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 2 Mar 2023 16:58:23 +0100 Subject: [bugfix] add ON CONFLICT statements to status updates (#1580) --- internal/db/bundb/status.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'internal/db/bundb/status.go') diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go index 8f1df2886..72e44068d 100644 --- a/internal/db/bundb/status.go +++ b/internal/db/bundb/status.go @@ -200,7 +200,9 @@ func (s *statusDB) PutStatus(ctx context.Context, status *gtsmodel.Status) db.Er Model(>smodel.StatusToEmoji{ StatusID: status.ID, EmojiID: i, - }).Exec(ctx); err != nil { + }). + On("CONFLICT (?, ?) DO NOTHING", bun.Ident("status_id"), bun.Ident("emoji_id")). + Exec(ctx); err != nil { err = s.conn.ProcessError(err) if !errors.Is(err, db.ErrAlreadyExists) { return err @@ -215,7 +217,9 @@ func (s *statusDB) PutStatus(ctx context.Context, status *gtsmodel.Status) db.Er Model(>smodel.StatusToTag{ StatusID: status.ID, TagID: i, - }).Exec(ctx); err != nil { + }). + On("CONFLICT (?, ?) DO NOTHING", bun.Ident("status_id"), bun.Ident("tag_id")). + Exec(ctx); err != nil { err = s.conn.ProcessError(err) if !errors.Is(err, db.ErrAlreadyExists) { return err @@ -261,7 +265,9 @@ func (s *statusDB) UpdateStatus(ctx context.Context, status *gtsmodel.Status, co Model(>smodel.StatusToEmoji{ StatusID: status.ID, EmojiID: i, - }).Exec(ctx); err != nil { + }). + On("CONFLICT (?, ?) DO NOTHING", bun.Ident("status_id"), bun.Ident("emoji_id")). + Exec(ctx); err != nil { err = s.conn.ProcessError(err) if !errors.Is(err, db.ErrAlreadyExists) { return err @@ -276,7 +282,9 @@ func (s *statusDB) UpdateStatus(ctx context.Context, status *gtsmodel.Status, co Model(>smodel.StatusToTag{ StatusID: status.ID, TagID: i, - }).Exec(ctx); err != nil { + }). + On("CONFLICT (?, ?) DO NOTHING", bun.Ident("status_id"), bun.Ident("tag_id")). + Exec(ctx); err != nil { err = s.conn.ProcessError(err) if !errors.Is(err, db.ErrAlreadyExists) { return err @@ -300,7 +308,7 @@ func (s *statusDB) UpdateStatus(ctx context.Context, status *gtsmodel.Status, co } } - // Finally, insert the status + // Finally, update the status _, err := tx. NewUpdate(). Model(status). -- cgit v1.2.3