summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-25 10:46:49 +0000
committerErik Johnston <erik@matrix.org>2019-01-25 10:46:49 +0000
commit19530671362021b2ef53f4926c278e346406997b (patch)
tree86f50ac60f5a8850ff02b2b4d10111338230ff0e /synapse
parentMerge pull request #4447 from matrix-org/erikj/msc_1813 (diff)
downloadsynapse-19530671362021b2ef53f4926c278e346406997b.tar.xz
Disable native upserts for sqlite, as they don't work
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 c64d73ff21..206919fcd5 100644
--- a/synapse/storage/engines/sqlite.py
+++ b/synapse/storage/engines/sqlite.py
@@ -34,10 +34,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 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 sqlite_version_info >= (3, 24, 0)
+        return False
 
     def check_database(self, txn):
         pass