From 78176406958bb1036fe7993130e9c4764e39a128 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 20 Apr 2022 15:44:05 +0100 Subject: [PATCH] Couple of guards around `sql.ErrNoRows` --- syncapi/streams/stream_pdu.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go index 2a9909e7c..8cefed4c4 100644 --- a/syncapi/streams/stream_pdu.go +++ b/syncapi/streams/stream_pdu.go @@ -229,6 +229,9 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse( eventFilter, true, true, ) if err != nil { + if err == sql.ErrNoRows { + return r.To, nil + } return r.From, fmt.Errorf("p.DB.RecentEvents: %w", err) } recentEvents := p.DB.StreamEventsToEvents(device, recentStreamEvents) @@ -273,7 +276,7 @@ func (p *PDUStreamProvider) addRoomDeltaToResponse( ctx, delta.RoomID, true, limited, stateFilter.IncludeRedundantMembers, device, recentEvents, delta.StateEvents, ) - if err != nil { + if err != nil && err != sql.ErrNoRows { return r.From, fmt.Errorf("p.lazyLoadMembers: %w", err) } }