summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-13 11:31:28 +0100
committerErik Johnston <erik@matrix.org>2015-05-13 11:31:28 +0100
commit02590c3e1db79c2c8f158a73562d139ce411d5d3 (patch)
tree67c0a3d878ae4f98be0e5212c2ce972e19eee3e2 /synapse
parentdefer.gatherResults loop (diff)
downloadsynapse-02590c3e1db79c2c8f158a73562d139ce411d5d3.tar.xz
Temp turn off checking for rejections and redactions
Diffstat (limited to '')
-rw-r--r--synapse/storage/state.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 2b5c2d999d..6d7d576cb6 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -85,10 +85,8 @@ class StateStore(SQLBaseStore):
 
         def fetch_events(txn, events):
             sql = (
-                "SELECT e.internal_metadata, e.json, r.event_id, rej.reason "
+                "SELECT e.internal_metadata, e.json "
                 " FROM event_json as e"
-                " LEFT JOIN redactions as r ON e.event_id = r.redacts"
-                " LEFT JOIN rejections as rej on rej.event_id = e.event_id"
                 " WHERE e.event_id IN (%s)"
             ) % (",".join(["?"]*len(events)),)
 
@@ -97,8 +95,7 @@ class StateStore(SQLBaseStore):
 
             return [
                 self._get_event_from_row_txn(
-                    txn, row[0], row[1], row[2],
-                    rejected_reason=row[3],
+                    txn, row[0], row[1], None
                 )
                 for row in rows
             ]