summary refs log tree commit diff
path: root/synapse/storage/data_stores
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-11-25 21:03:17 +0000
committerGitHub <noreply@github.com>2019-11-25 21:03:17 +0000
commitc01d5435843ad4af3d520851e86d9938b47b2d12 (patch)
tree52ab56d75cd81ed00c2cf03c50f285e830617635 /synapse/storage/data_stores
parentMerge tag 'v1.6.0rc2' into develop (diff)
downloadsynapse-c01d5435843ad4af3d520851e86d9938b47b2d12.tar.xz
Make sure that we close cursors before returning from a query (#6408)
There are lots of words in the comment as to why this is a good idea.

Fixes #6403.
Diffstat (limited to 'synapse/storage/data_stores')
-rw-r--r--synapse/storage/data_stores/main/receipts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/receipts.py b/synapse/storage/data_stores/main/receipts.py
index 0c24430f28..8b17334ff4 100644
--- a/synapse/storage/data_stores/main/receipts.py
+++ b/synapse/storage/data_stores/main/receipts.py
@@ -280,7 +280,7 @@ class ReceiptsWorkerStore(SQLBaseStore):
                 args.append(limit)
             txn.execute(sql, args)
 
-            return (r[0:5] + (json.loads(r[5]),) for r in txn)
+            return list(r[0:5] + (json.loads(r[5]),) for r in txn)
 
         return self.runInteraction(
             "get_all_updated_receipts", get_all_updated_receipts_txn