summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-03-11 17:19:17 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-03-11 17:19:17 +0000
commit59a5f012ccaef5c255014efdbbb800ecfb73a2b7 (patch)
tree9576e6daeddaff614400f3b3e5afa78d00ad7dcd /synapse/storage/_base.py
parentAdd a description to storage layer's _execute_and_decode() (diff)
downloadsynapse-59a5f012ccaef5c255014efdbbb800ecfb73a2b7.tar.xz
Also give _execute() a description
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index a4e1d66e28..3ea7382760 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -259,7 +259,7 @@ class SQLBaseStore(object):
         )
         return results
 
-    def _execute(self, decoder, query, *args):
+    def _execute(self, desc, decoder, query, *args):
         """Runs a single query for a result set.
 
         Args:
@@ -277,11 +277,10 @@ class SQLBaseStore(object):
             else:
                 return cursor.fetchall()
 
-        return self.runInteraction("_execute", interaction)
+        return self.runInteraction(desc, interaction)
 
     def _execute_and_decode(self, desc, query, *args):
-        # TODO: for now ignore desc
-        return self._execute(self.cursor_to_dict, query, *args)
+        return self._execute(desc, self.cursor_to_dict, query, *args)
 
     # "Simple" SQL API methods that operate on a single table with no JOINs,
     # no complex WHERE clauses, just a dict of values for columns.