summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-01-29 10:04:23 +0000
committerGitHub <noreply@github.com>2019-01-29 10:04:23 +0000
commit94fb63e44f33b6679cdb7f0bb989e9864d6babd0 (patch)
tree45fd894f292397192ab00785716f9f2d837c4837
parentMerge pull request #4493 from matrix-org/erikj/refactor_event_signing (diff)
downloadsynapse-94fb63e44f33b6679cdb7f0bb989e9864d6babd0.tar.xz
Fix typo in upserts code (#4505)
* fix obvious problem :|

* changelog
-rw-r--r--changelog.d/4505.misc1
-rw-r--r--synapse/storage/_base.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/4505.misc b/changelog.d/4505.misc
new file mode 100644
index 0000000000..994801fd1e
--- /dev/null
+++ b/changelog.d/4505.misc
@@ -0,0 +1 @@
+ Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+ and SQLite 3.24+.
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 5109bc3e2e..4872ff55b6 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -236,7 +236,7 @@ class SQLBaseStore(object):
             self._unsafe_to_upsert_tables.discard("user_ips")
 
         # If there's any tables left to check, reschedule to run.
-        if self.updates:
+        if updates:
             self._clock.call_later(
                 15.0,
                 run_as_background_process,