diff options
| author | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-01-30 10:56:47 +0000 |
| commit | b37e8c9572ef90367bef9e70b66150fdfe243e5d (patch) | |
| tree | 1207a22a9529d48603317826926bc02866a474a0 /synapse/storage/engines/sqlite.py | |
| parent | isort (diff) | |
| parent | Merge branch 'develop' into neilj/room_capabilities (diff) | |
| download | synapse-b37e8c9572ef90367bef9e70b66150fdfe243e5d.tar.xz | |
Merge branch 'neilj/room_capabilities' of github.com:matrix-org/synapse into neilj/room_capabilities
Diffstat (limited to 'synapse/storage/engines/sqlite.py')
| -rw-r--r-- | synapse/storage/engines/sqlite.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/engines/sqlite.py b/synapse/storage/engines/sqlite.py index c64d73ff21..059ab81055 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 @@ -37,7 +36,7 @@ class Sqlite3Engine(object): 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. """ - return sqlite_version_info >= (3, 24, 0) + return self.module.sqlite_version_info >= (3, 24, 0) def check_database(self, txn): pass |