Skip to content
Snippets Groups Projects
Commit 0b3fd140 authored by Andrew Morgan's avatar Andrew Morgan Committed by Amber Brown
Browse files

Don't require sqlite3 when using postgres (#4466)

parent b1b6dba2
No related branches found
No related tags found
No related merge requests found
Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+ and SQLite 3.24+.
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
import struct import struct
import threading import threading
from sqlite3 import sqlite_version_info
from synapse.storage.prepare_database import prepare_database from synapse.storage.prepare_database import prepare_database
...@@ -37,7 +36,7 @@ class Sqlite3Engine(object): ...@@ -37,7 +36,7 @@ class Sqlite3Engine(object):
Do we support native UPSERTs? This requires SQLite3 3.24+, plus some 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. 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): def check_database(self, txn):
pass pass
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment