From 2529f2bc01781314ecdedd69e272c737ba1a71f5 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 14 Aug 2014 16:58:51 +0100
Subject: [PATCH] Rename _execute_query

---
 synapse/storage/__init__.py   | 2 +-
 synapse/storage/_base.py      | 2 +-
 synapse/storage/feedback.py   | 2 +-
 synapse/storage/roommember.py | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py
index cd9acdc447..75d93f7111 100644
--- a/synapse/storage/__init__.py
+++ b/synapse/storage/__init__.py
@@ -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(
 
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index befeb55b25..7fef8601e7 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -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,
diff --git a/synapse/storage/feedback.py b/synapse/storage/feedback.py
index b9e792c120..dd5f3fbc10 100644
--- a/synapse/storage/feedback.py
+++ b/synapse/storage/feedback.py
@@ -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(
             [
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 60296380e6..c99cefbcfc 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -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)