summary refs log tree commit diff
path: root/synapse/storage/transactions.py
diff options
context:
space:
mode:
Diffstat (limited to 'synapse/storage/transactions.py')
-rw-r--r--synapse/storage/transactions.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index b777395e06..7d22392444 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -125,8 +125,8 @@ class TransactionStore(SQLBaseStore):
                 SentTransactions.select_statement("destination = ?"),
             )
 
-        results = txn.execute(query, (destination,))
-        results = SentTransactions.decode_results(results)
+        txn.execute(query, (destination,))
+        results = SentTransactions.decode_results(txn.fetchall())
 
         prev_txns = [r.transaction_id for r in results]
 
@@ -134,7 +134,7 @@ class TransactionStore(SQLBaseStore):
 
         query = SentTransactions.insert_statement()
         txn.execute(query, SentTransactions.EntryType(
-            None,
+            self.get_next_stream_id(),
             transaction_id=transaction_id,
             destination=destination,
             ts=origin_server_ts,
@@ -270,7 +270,7 @@ class TransactionStore(SQLBaseStore):
                                        retry_last_ts, retry_interval):
 
         query = (
-            "INSERT OR REPLACE INTO %s "
+            "REPLACE INTO %s "
             "(destination, retry_last_ts, retry_interval) "
             "VALUES (?, ?, ?) "
         ) % DestinationsTable.table_name