Merge branch 'master' into add-nats-support

This commit is contained in:
Neil Alexander 2021-07-26 12:56:49 +01:00 committed by GitHub
commit 4704957dab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 5 deletions

View file

@ -174,6 +174,9 @@ func UpStateBlocksRefactor(tx *sql.Tx) error {
err = tx.QueryRow(
`SELECT event_nid FROM roomserver_events WHERE state_snapshot_nid = $1 AND event_type_nid = 1`, s.StateSnapshotNID,
).Scan(&createEventNID)
if err == sql.ErrNoRows {
continue
}
if err != nil {
return fmt.Errorf("cannot xref null state block with snapshot %d: %s", s.StateSnapshotNID, err)
}