summary refs log tree commit diff
path: root/synapse/storage/databases/main/stream.py
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-05-17 11:00:54 +0100
committerDavid Robertson <davidr@element.io>2022-05-17 11:00:54 +0100
commit1402159bb8aed448b79c89ff62868c5b9f485f5e (patch)
tree813a031e214a2afa5cd5a861bc2306088745cab0 /synapse/storage/databases/main/stream.py
parentAdd index to cache invalidations (#12747) (diff)
parentversion tweak in changelog (diff)
downloadsynapse-1402159bb8aed448b79c89ff62868c5b9f485f5e.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/storage/databases/main/stream.py')
-rw-r--r--synapse/storage/databases/main/stream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/databases/main/stream.py b/synapse/storage/databases/main/stream.py
index 944e2a5b0b..0e3a23a140 100644
--- a/synapse/storage/databases/main/stream.py
+++ b/synapse/storage/databases/main/stream.py
@@ -750,7 +750,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore):
                 WHERE room_id = ?
                     AND stream_ordering <= ?
                     AND NOT outlier
-                    AND rejections.reason IS NULL
+                    AND rejections.event_id IS NULL
                 ORDER BY stream_ordering DESC
                 LIMIT 1
             """