decode_result takes an iterable

2015-03-20 10:57:08 +00:00 · 2015-03-20 10:57:08 +00:00 · d4f50f3ae5
parent 455579ca90
commit d4f50f3ae5
2 changed files with 5 additions and 2 deletions
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@ -68,7 +68,10 @@ class RoomStore(SQLBaseStore):
        """
        query = RoomsTable.select_statement("room_id=?")
        return self._execute(
-            "get_room", RoomsTable.decode_single_result, query, room_id,
+            "get_room",
+            lambda txn: RoomsTable.decode_single_result(txn.fetchall()),
+            query,
+            room_id,
        )

    @defer.inlineCallbacks
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@ -122,7 +122,7 @@ class TransactionStore(SQLBaseStore):
            )

        txn.execute(query, (destination,))
-        results = SentTransactions.decode_results(txn)
+        results = SentTransactions.decode_results(txn.fetchall())

        prev_txns = [r.transaction_id for r in results]