Couple of guards around sql.ErrNoRows

This commit is contained in:
Neil Alexander 2022-04-20 15:44:05 +01:00
parent de97ce3439
commit 7817640695
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -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)
}
}