Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-05-07 21:04:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert

Browse source
This commit is contained in:
Erik Johnston 2019-01-25 14:11:17 +00:00
commit 431e485914
13 changed files with 120 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/engines/sqlite.py
View file

@ -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):