From 70899d3ab29cd57301fb135130c940f312bfe482 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 24 Sep 2014 15:27:59 +0100 Subject: Rename deletions to redactions --- synapse/storage/roommember.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'synapse/storage/roommember.py') diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 97222da571..84c462330b 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -183,18 +183,18 @@ class RoomMemberStore(SQLBaseStore): def _get_members_query_txn(self, txn, where_clause, where_values): del_sql = ( - "SELECT event_id FROM deletions WHERE deletes = e.event_id" + "SELECT event_id FROM redactions WHERE redacts = e.event_id" ) sql = ( - "SELECT e.*, (%(deleted)s) AS deleted FROM events as e " + "SELECT e.*, (%(redacted)s) AS redacted FROM events as e " "INNER JOIN room_memberships as m " "ON e.event_id = m.event_id " "INNER JOIN current_state_events as c " "ON m.event_id = c.event_id " "WHERE %(where)s " ) % { - "deleted": del_sql, + "redacted": del_sql, "where": where_clause, } -- cgit 1.4.1