Rename _execute_query

paul/schema_breaking_changes
Erik Johnston 2014-08-14 16:58:51 +01:00
parent 937c175029
commit 2529f2bc01
4 changed files with 4 additions and 4 deletions

View File

@ -119,7 +119,7 @@ class DataStore(RoomDataStore, RoomMemberStore, MessageStore, RoomStore,
else:
args = (room_id, )
results = yield self._execute_query(sql, *args)
results = yield self._execute_and_decode(sql, *args)
defer.returnValue(

View File

@ -71,7 +71,7 @@ class SQLBaseStore(object):
return self._db_pool.runInteraction(interaction)
def _execut_query(self, query, *args):
def _execute_and_decode(self, query, *args):
return self._execute(self.cursor_to_dict, *args)
# "Simple" SQL API methods that operate on a single table with no JOINs,

View File

@ -39,7 +39,7 @@ class FeedbackStore(SQLBaseStore):
"WHERE feedback.target_event_id = ? "
)
rows = yield self._execute_query(sql, event_id)
rows = yield self._execute_and_decode(sql, event_id)
defer.returnValue(
[

View File

@ -141,6 +141,6 @@ class RoomMemberStore(SQLBaseStore):
"WHERE %s "
) % (where_clause,)
rows = yield self._execute_query(sql, where_values)
rows = yield self._execute_and_decode(sql, where_values)
results = [self._parse_event_from_row(r) for r in rows]
defer.returnValue(results)