Be more specific in naming columns in selects.

pull/40/head
Erik Johnston 2015-01-30 14:48:11 +00:00
parent 472cf532b7
commit 2f4cb04f45
1 changed files with 1 additions and 1 deletions

View File

@ -504,7 +504,7 @@ class SQLBaseStore(object):
def _get_event_txn(self, txn, event_id, check_redacted=True, def _get_event_txn(self, txn, event_id, check_redacted=True,
get_prev_content=False, allow_rejected=False): get_prev_content=False, allow_rejected=False):
sql = ( 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 " "FROM event_json as e "
"LEFT JOIN redactions as r ON e.event_id = r.redacts " "LEFT JOIN redactions as r ON e.event_id = r.redacts "
"LEFT JOIN rejections as rej on rej.event_id = e.event_id " "LEFT JOIN rejections as rej on rej.event_id = e.event_id "