summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2021-10-21 18:49:30 -0500
committerEric Eastwood <erice@element.io>2021-10-21 18:49:30 -0500
commit1d3f4170464309d475d964ef098d08b303519ad4 (patch)
tree75beecd6423e11d213d72679fb776fc16936f3cd
parentMerge branch 'develop' into madlittlemods/return-historical-events-in-order-f... (diff)
downloadsynapse-1d3f4170464309d475d964ef098d08b303519ad4.tar.xz
Revert back to string interpolation for SQL boolean value
Maybe fixes the `sqlite3.OperationalError: no such column: FALSE,` problem in CI,
https://github.com/matrix-org/synapse/runs/3962382283#step:4:11038
-rw-r--r--synapse/storage/databases/main/events.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py

index cc20f0f6b2..e4f5c86244 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py
@@ -2146,14 +2146,14 @@ class PersistEventsStore: " SELECT 1 FROM events" " LEFT JOIN event_edges edge" " ON edge.event_id = events.event_id" - " WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = FALSE OR edge.event_id IS NULL)" + " WHERE events.event_id = ? AND events.room_id = ? AND (events.outlier = ? OR edge.event_id IS NULL)" " )" ) txn.execute_batch( query, [ - (e_id, ev.room_id, e_id, ev.room_id, e_id, ev.room_id) + (e_id, ev.room_id, e_id, ev.room_id, e_id, ev.room_id, False) for ev in events for e_id in ev.prev_event_ids() if not ev.internal_metadata.is_outlier()