Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upgrade

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/storage/test_base.py b/tests/storage/test_base.py

index 829f47d2e8..452d76ddd5 100644
--- a/tests/storage/test_base.py
+++ b/tests/storage/test_base.py
@@ -49,6 +49,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
         self.db_pool.runWithConnection = runWithConnection
 
         config = Mock()
+        config._enable_native_upserts = False
         config.event_cache_size = 1
         config.database_config = {"name": "sqlite3"}
         hs = TestHomeServer(