summary refs log tree commit diff
path: root/synapse/storage/data_stores/main/transactions.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-05 10:43:49 +0000
committerGitHub <noreply@github.com>2019-12-05 10:43:49 +0000
commitddbbfc9512cd9b66d3af57ab5e9fb1e5a0418913 (patch)
treeeb061c5e86be7baf9428161715637a0f12bb2ff3 /synapse/storage/data_stores/main/transactions.py
parentMerge pull request #6470 from matrix-org/babolivier/port_db_ci_failure (diff)
parentNewsfile (diff)
downloadsynapse-ddbbfc9512cd9b66d3af57ab5e9fb1e5a0418913.tar.xz
Merge pull request #6464 from matrix-org/erikj/make_public_sql_base
Clean up SQLBaseStore private function usage
Diffstat (limited to 'synapse/storage/data_stores/main/transactions.py')
-rw-r--r--synapse/storage/data_stores/main/transactions.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/synapse/storage/data_stores/main/transactions.py b/synapse/storage/data_stores/main/transactions.py

index 01b1be5e14..c162f3ea16 100644 --- a/synapse/storage/data_stores/main/transactions.py +++ b/synapse/storage/data_stores/main/transactions.py
@@ -85,7 +85,7 @@ class TransactionStore(SQLBaseStore): ) def _get_received_txn_response(self, txn, transaction_id, origin): - result = self._simple_select_one_txn( + result = self.simple_select_one_txn( txn, table="received_transactions", keyvalues={"transaction_id": transaction_id, "origin": origin}, @@ -119,7 +119,7 @@ class TransactionStore(SQLBaseStore): response_json (str) """ - return self._simple_insert( + return self.simple_insert( table="received_transactions", values={ "transaction_id": transaction_id, @@ -160,7 +160,7 @@ class TransactionStore(SQLBaseStore): return result def _get_destination_retry_timings(self, txn, destination): - result = self._simple_select_one_txn( + result = self.simple_select_one_txn( txn, table="destinations", keyvalues={"destination": destination}, @@ -227,7 +227,7 @@ class TransactionStore(SQLBaseStore): # We need to be careful here as the data may have changed from under us # due to a worker setting the timings. - prev_row = self._simple_select_one_txn( + prev_row = self.simple_select_one_txn( txn, table="destinations", keyvalues={"destination": destination}, @@ -236,7 +236,7 @@ class TransactionStore(SQLBaseStore): ) if not prev_row: - self._simple_insert_txn( + self.simple_insert_txn( txn, table="destinations", values={ @@ -247,7 +247,7 @@ class TransactionStore(SQLBaseStore): }, ) elif retry_interval == 0 or prev_row["retry_interval"] < retry_interval: - self._simple_update_one_txn( + self.simple_update_one_txn( txn, "destinations", keyvalues={"destination": destination},