From 15349d8287fa3880828c576fad66a2e556cea751 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Wed, 9 Sep 2020 16:12:46 +0100 Subject: [PATCH] Return errors from SQL statements to handle rollbacks correctly --- syncapi/storage/shared/syncserver.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go index 76db40537..38362cc35 100644 --- a/syncapi/storage/shared/syncserver.go +++ b/syncapi/storage/shared/syncserver.go @@ -169,9 +169,9 @@ func (d *Database) RetireInviteEvent( func (d *Database) AddPeek( ctx context.Context, roomID, userID, deviceID string, ) (sp types.StreamPosition, err error) { - _ = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { + err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { sp, err = d.Peeks.InsertPeek(ctx, txn, roomID, userID, deviceID) - return nil + return err }) return } @@ -182,9 +182,9 @@ func (d *Database) AddPeek( func (d *Database) DeletePeeks( ctx context.Context, roomID, userID string, ) (sp types.StreamPosition, err error) { - _ = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { + err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { sp, err = d.Peeks.DeletePeeks(ctx, txn, roomID, userID) - return nil + return err }) if err == sql.ErrNoRows { err = nil