summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-29 16:35:20 +0100
committerErik Johnston <erik@matrix.org>2015-04-29 16:35:20 +0100
commit884fb88e286008a1a8fef902cec928fad4a9cac9 (patch)
tree54c6714c160ed6a00bbac80d61eda63e902792f0
parentFix invalid SQL to work in postgres land (diff)
downloadsynapse-884fb88e286008a1a8fef902cec928fad4a9cac9.tar.xz
txn.execute doesn't return cursors
-rw-r--r--synapse/storage/appservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py

index bd285a6699..e133cf5550 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py
@@ -441,12 +441,12 @@ class ApplicationServiceTransactionStore(SQLBaseStore): def _get_oldest_unsent_txn(self, txn, service): # Monotonically increasing txn ids, so just select the smallest # one in the txns table (we delete them when they are sent) - result = txn.execute( + txn.execute( "SELECT * FROM application_services_txns WHERE as_id=?" " ORDER BY txn_id ASC LIMIT 1", (service.id,) ) - rows = self.cursor_to_dict(result) + rows = self.cursor_to_dict(txn) if not rows: return None