This commit is contained in:
Erik Johnston 2015-01-06 13:13:17 +00:00
parent 12819d5082
commit af1c7c7808
2 changed files with 4 additions and 3 deletions

View file

@ -449,7 +449,8 @@ class SQLBaseStore(object):
return [
self._get_event_txn(
txn, event_id,
check_redacted=check_redacted, get_prev_content=get_prev_content
check_redacted=check_redacted,
get_prev_content=get_prev_content
)
for event_id in event_ids
]
@ -473,7 +474,8 @@ class SQLBaseStore(object):
internal_metadata, js, redacted = res
return self._get_event_from_row_txn(
txn, internal_metadata, js, redacted, check_redacted=check_redacted,
txn, internal_metadata, js, redacted,
check_redacted=check_redacted,
get_prev_content=get_prev_content,
)

View file

@ -142,7 +142,6 @@ class StreamStore(SQLBaseStore):
limit=0, with_feedback=False):
# TODO (erikj): Handle compressed feedback
current_room_membership_sql = (
"SELECT m.room_id FROM room_memberships as m "
"INNER JOIN current_state_events as c ON m.event_id = c.event_id "