Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
0b3fd140
Commit
0b3fd140
authored
6 years ago
by
Andrew Morgan
Committed by
Amber Brown
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't require sqlite3 when using postgres (#4466)
parent
b1b6dba2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/4466.misc
+1
-0
1 addition, 0 deletions
changelog.d/4466.misc
synapse/storage/engines/sqlite.py
+1
-2
1 addition, 2 deletions
synapse/storage/engines/sqlite.py
with
2 additions
and
2 deletions
changelog.d/4466.misc
0 → 100644
+
1
−
0
View file @
0b3fd140
Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+ and SQLite 3.24+.
This diff is collapsed.
Click to expand it.
synapse/storage/engines/sqlite.py
+
1
−
2
View file @
0b3fd140
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment