diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2023-01-31 11:03:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-31 11:03:55 +0000 |
| commit | 6d14fdc2710688014a7a66cc48485462c6e86a1e (patch) | |
| tree | 45d6a2a185e0bb7832504892d319f89265df30c3 /synapse/storage/engines/postgres.py | |
| parent | Reject boolean power levels (#14944) (diff) | |
| download | synapse-6d14fdc2710688014a7a66cc48485462c6e86a1e.tar.xz | |
Make sqlite database migrations transactional again, part two (#14926)
#14910 fixed the regression introduced by #13873 where sqlite database migrations would no longer run inside a transaction. However, it committed the transaction before Synapse updated its bookkeeping of which migrations have been run, which means that migrations may be run again after they have completed successfully. Leave the transaction open at the end of `executescript`, to restore the old, correct behaviour. Also make the PostgreSQL behaviour consistent with SQLite. Fixes #14909. Signed-off-by: Sean Quah <seanq@matrix.org>
Diffstat (limited to 'synapse/storage/engines/postgres.py')
| -rw-r--r-- | synapse/storage/engines/postgres.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/storage/engines/postgres.py b/synapse/storage/engines/postgres.py index f9f562ea45..b350f57ccb 100644 --- a/synapse/storage/engines/postgres.py +++ b/synapse/storage/engines/postgres.py @@ -220,5 +220,9 @@ class PostgresEngine( """Execute a chunk of SQL containing multiple semicolon-delimited statements. Psycopg2 seems happy to do this in DBAPI2's `execute()` function. + + For consistency with SQLite, any ongoing transaction is committed before + executing the script in its own transaction. The script transaction is + left open and it is the responsibility of the caller to commit it. """ - cursor.execute(script) + cursor.execute(f"COMMIT; BEGIN TRANSACTION; {script}") |