summary refs log tree commit diff
path: root/synapse/storage/engines/sqlite.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
committerErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
commit431e485914b01eb1b245e37df814ff5bac110be1 (patch)
tree1262900b08616aa08768d9883349b11725218528 /synapse/storage/engines/sqlite.py
parentNewsfile (diff)
parentFix quoting for allowed_local_3pids example config (#4476) (diff)
downloadsynapse-431e485914b01eb1b245e37df814ff5bac110be1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert
Diffstat (limited to 'synapse/storage/engines/sqlite.py')
-rw-r--r--synapse/storage/engines/sqlite.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/engines/sqlite.py b/synapse/storage/engines/sqlite.py
index 206919fcd5..31b8449ca1 100644
--- a/synapse/storage/engines/sqlite.py
+++ b/synapse/storage/engines/sqlite.py
@@ -15,7 +15,6 @@
 
 import struct
 import threading
-from sqlite3 import sqlite_version_info
 
 from synapse.storage.prepare_database import prepare_database
 
@@ -40,7 +39,7 @@ class Sqlite3Engine(object):
         # when its enabled.
         # FIXME: Figure out what is wrong so we can re-enable native upserts
 
-        # return sqlite_version_info >= (3, 24, 0)
+        # return self.module.sqlite_version_info >= (3, 24, 0)
         return False
 
     def check_database(self, txn):