diff options
| author | Erik Johnston <erik@matrix.org> | 2016-11-21 11:53:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-11-21 11:53:02 +0000 |
| commit | 524d61bf7ef293a56201852aa64a16d5c50abd93 (patch) | |
| tree | db585c09a49716dbd5812491d8bdc5b23575176a /synapse | |
| parent | Store federation stream positions in the database (diff) | |
| download | synapse-524d61bf7ef293a56201852aa64a16d5c50abd93.tar.xz | |
Fix tests
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 3 | ||||
| -rw-r--r-- | synapse/storage/_base.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 1b0ea070c2..c864e12287 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -259,6 +259,9 @@ class TransactionQueue(object): self._attempt_new_transaction, destination ) + def get_current_token(self): + return 0 + @defer.inlineCallbacks def _attempt_new_transaction(self, destination): # list of (pending_pdu, deferred, order) diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index d3686b9690..b62c459d8b 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -562,7 +562,7 @@ class SQLBaseStore(object): @staticmethod def _simple_select_onecol_txn(txn, table, keyvalues, retcol): if keyvalues: - where = " WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys()) + where = "WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys()) else: where = "" @@ -750,7 +750,7 @@ class SQLBaseStore(object): @staticmethod def _simple_update_one_txn(txn, table, keyvalues, updatevalues): if keyvalues: - where = " WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys()) + where = "WHERE %s" % " AND ".join("%s = ?" % k for k in keyvalues.keys()) else: where = "" |