mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-23 14:53:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Return errors from SQL statements to handle rollbacks correctly

Browse source
This commit is contained in:
Kegan Dougal 2020-09-09 16:12:46 +01:00
parent f09afe0f65
commit 15349d8287
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
syncapi/storage/shared/syncserver.go
View file

@ -169,9 +169,9 @@ func (d *Database) RetireInviteEvent(
func (d *Database) AddPeek( func (d *Database) AddPeek(
ctx context.Context, roomID, userID, deviceID string, ctx context.Context, roomID, userID, deviceID string,
) (sp types.StreamPosition, err error) { ) (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) sp, err = d.Peeks.InsertPeek(ctx, txn, roomID, userID, deviceID)
return nil return err
}) })
return return
} }
@ -182,9 +182,9 @@ func (d *Database) AddPeek(
func (d *Database) DeletePeeks( func (d *Database) DeletePeeks(
ctx context.Context, roomID, userID string, ctx context.Context, roomID, userID string,
) (sp types.StreamPosition, err error) { ) (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) sp, err = d.Peeks.DeletePeeks(ctx, txn, roomID, userID)
return nil return err
}) })
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
err = nil err = nil