MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-11-14 05:52:37 +01:00
Code Issues Projects Releases Wiki Activity

Use better names in SQL

Browse source
This commit is contained in:
Erik Johnston 2019-09-09 13:33:38 +01:00
parent 916c697228
commit e7184a4370
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/storage/events.py
View file

@ -1586,12 +1586,15 @@ class EventsStore(
# We use the range [-max_pos, max_pos] to handle backfilled events, # We use the range [-max_pos, max_pos] to handle backfilled events,
# which are given negative stream ordering. # which are given negative stream ordering.
sql = """ sql = """
SELECT er.event_id, redacts FROM redactions SELECT redact_event.event_id, redacts FROM redactions
INNER JOIN events AS er USING (event_id) INNER JOIN events AS redact_event USING (event_id)
INNER JOIN events AS eb ON (er.room_id = eb.room_id AND redacts = eb.event_id) INNER JOIN events AS original_event ON (
redact_event.room_id = original_event.room_id
AND redacts = original_event.event_id
)
WHERE NOT have_censored WHERE NOT have_censored
AND ? <= er.stream_ordering AND er.stream_ordering <= ? AND ? <= redact_event.stream_ordering AND redact_event.stream_ordering <= ?
ORDER BY er.stream_ordering ASC ORDER BY redact_event.stream_ordering ASC
LIMIT ? LIMIT ?
""" """