diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2023-01-25 13:38:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 13:38:53 +0000 |
| commit | a63d4cc9e96c1f5bb9c5bb9fc9119fb137de3b1b (patch) | |
| tree | 664de7b53d6e04cc31428f015752fc32ee840192 /synapse/storage/engines/sqlite.py | |
| parent | Document the export user data command. (#14883) (diff) | |
| download | synapse-a63d4cc9e96c1f5bb9c5bb9fc9119fb137de3b1b.tar.xz | |
Make sqlite database migrations transactional again (#14910)
#13873 introduced a regression which causes sqlite database migrations to no longer run inside a transaction. Wrap them in a transaction again, to avoid database corruption when migrations are interrupted. Fixes #14909. Signed-off-by: Sean Quah <seanq@matrix.org>
Diffstat (limited to 'synapse/storage/engines/sqlite.py')
| -rw-r--r-- | synapse/storage/engines/sqlite.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/storage/engines/sqlite.py b/synapse/storage/engines/sqlite.py index 14260442b6..2f7df85ce4 100644 --- a/synapse/storage/engines/sqlite.py +++ b/synapse/storage/engines/sqlite.py @@ -135,13 +135,14 @@ class Sqlite3Engine(BaseDatabaseEngine[sqlite3.Connection, sqlite3.Cursor]): > than one statement with it, it will raise a Warning. Use executescript() if > you want to execute multiple SQL statements with one call. - Though the docs for `executescript` warn: + The script is wrapped in transaction control statemnets, since the docs for + `executescript` warn: > If there is a pending transaction, an implicit COMMIT statement is executed > first. No other implicit transaction control is performed; any transaction > control must be added to sql_script. """ - cursor.executescript(script) + cursor.executescript(f"BEGIN TRANSACTION;\n{script}\nCOMMIT;") # Following functions taken from: https://github.com/coleifer/peewee |