summary refs log tree commit diff
path: root/synapse/storage/receipts.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-04-05 14:10:16 +0100
committerErik Johnston <erik@matrix.org>2019-04-05 14:10:16 +0100
commit9bf49abc07882766972e28a76c5a068de0ebd0a9 (patch)
tree64fab2db39db7846b8968bde53ecd8159c2c9d0d /synapse/storage/receipts.py
parentPrevent exception when hs or shadow_hs missing (#5012) (diff)
parent0.99.3 (diff)
downloadsynapse-9bf49abc07882766972e28a76c5a068de0ebd0a9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into dinsic
Diffstat (limited to 'synapse/storage/receipts.py')
-rw-r--r--synapse/storage/receipts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/storage/receipts.py b/synapse/storage/receipts.py

index 0fd1ccc40a..89a1f7e3d7 100644 --- a/synapse/storage/receipts.py +++ b/synapse/storage/receipts.py
@@ -301,7 +301,9 @@ class ReceiptsWorkerStore(SQLBaseStore): args.append(limit) txn.execute(sql, args) - return txn.fetchall() + return ( + r[0:5] + (json.loads(r[5]), ) for r in txn + ) return self.runInteraction( "get_all_updated_receipts", get_all_updated_receipts_txn )