|
|
|
@ -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 |
|
|
|
|
] |
|
|
|
|