Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4471 from matrix-org/erikj/sqlite_native_upsert 

Disable native upsert on sqlite
This commit is contained in:
Erik Johnston 2019-01-25 14:31:05 +00:00 committed by GitHub
parent 4a3f138832 431e485914
commit 57c035debe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/4306.misc
View File

@ -1 +1 @@
Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+ and SQLite 3.24+. Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+.

1
changelog.d/4471.misc Normal file
View File

@ -0,0 +1 @@
Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+.

10
synapse/storage/engines/sqlite.py
View File

@ -33,10 +33,14 @@ class Sqlite3Engine(object):
@property @property
def can_native_upsert(self): def can_native_upsert(self):
""" """
Do we support native UPSERTs? This requires SQLite3 3.24+, plus some Do we support native UPSERTs?
more work we haven't done yet to tell what was inserted vs updated.
""" """
return self.module.sqlite_version_info >= (3, 24, 0) # SQLite3 3.24+ supports them, but empirically the unit tests don't work
# when its enabled.
# FIXME: Figure out what is wrong so we can re-enable native upserts
# return self.module.sqlite_version_info >= (3, 24, 0)
return False
def check_database(self, txn): def check_database(self, txn):
pass pass