summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-01-25 14:31:05 +0000
committerGitHub <noreply@github.com>2019-01-25 14:31:05 +0000
commit57c035debe904c4a2887c981dbf48acfb9a87ce7 (patch)
tree1262900b08616aa08768d9883349b11725218528 /synapse
parentFix quoting for allowed_local_3pids example config (#4476) (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat... (diff)
downloadsynapse-57c035debe904c4a2887c981dbf48acfb9a87ce7.tar.xz
Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert
Disable native upsert on sqlite
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/engines/sqlite.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/synapse/storage/engines/sqlite.py b/synapse/storage/engines/sqlite.py
index 059ab81055..31b8449ca1 100644
--- a/synapse/storage/engines/sqlite.py
+++ b/synapse/storage/engines/sqlite.py
@@ -33,10 +33,14 @@ class Sqlite3Engine(object):
     @property
     def can_native_upsert(self):
         """
-        Do we support native UPSERTs? This requires SQLite3 3.24+, plus some
-        more work we haven't done yet to tell what was inserted vs updated.
+        Do we support native UPSERTs?
         """
-        return self.module.sqlite_version_info >= (3, 24, 0)
+        # SQLite3 3.24+ supports them, but empirically the unit tests don't work
+        # when its enabled.
+        # FIXME: Figure out what is wrong so we can re-enable native upserts
+
+        # return self.module.sqlite_version_info >= (3, 24, 0)
+        return False
 
     def check_database(self, txn):
         pass