summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 14:48:11 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 14:48:11 +0000
commit2f4cb04f455d24d0086b37bc363137e995d908d5 (patch)
tree6cecc433f1cbce21568dd55cc35e0bd51861553a /synapse
parentPut CREATE rejections into seperate .sql (diff)
downloadsynapse-2f4cb04f455d24d0086b37bc363137e995d908d5.tar.xz
Be more specific in naming columns in selects.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 1f5e74a16a..b350fd61f1 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -504,7 +504,7 @@ class SQLBaseStore(object):
     def _get_event_txn(self, txn, event_id, check_redacted=True,
                        get_prev_content=False, allow_rejected=False):
         sql = (
-            "SELECT internal_metadata, json, r.event_id, reason "
+            "SELECT e.internal_metadata, e.json, r.event_id, rej.reason "
             "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  "