Instance name may be null

erikjohnston · erikjohnston · commit 70c6722649f0 · 2024-08-30T13:04:08.000+01:00
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py
@@ -1861,7 +1861,7 @@ def _update_current_state_txn(
                 VALUES (
                     ?, ?, ?, ?, ?,
                     (SELECT stream_ordering FROM events WHERE event_id = ?),
-                    (SELECT instance_name FROM events WHERE event_id = ?)
+                    (SELECT COALESCE(instance_name, 'master') FROM events WHERE event_id = ?)
                     {("," + ", ".join("?" for _ in sliding_sync_snapshot_values)) if sliding_sync_snapshot_values else ""}
                 )
                 ON CONFLICT (room_id, user_id)

Original file line number	Diff line number	Diff line change
`@@ -1861,7 +1861,7 @@ def _update_current_state_txn(`
`1861`	`1861`	`VALUES (`
`1862`	`1862`	`?, ?, ?, ?, ?,`
`1863`	`1863`	`(SELECT stream_ordering FROM events WHERE event_id = ?),`
`1864`		`- (SELECT instance_name FROM events WHERE event_id = ?)`
	`1864`	`+ (SELECT COALESCE(instance_name, 'master') FROM events WHERE event_id = ?)`
`1865`	`1865`	`{("," + ", ".join("?" for _ in sliding_sync_snapshot_values)) if sliding_sync_snapshot_values else ""}`
`1866`	`1866`	`)`
`1867`	`1867`	`ON CONFLICT (room_id, user_id)`