Obey no-transaction flag in down migrations (#3528)

This commit is contained in:
Andrei Nesterov 2024-10-03 01:32:30 +03:00 committed by GitHub
parent 72512f7311
commit 19f40d87a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -252,20 +252,18 @@ CREATE TABLE IF NOT EXISTS _sqlx_migrations (
migration: &'m Migration,
) -> BoxFuture<'m, Result<Duration, MigrateError>> {
Box::pin(async move {
// Use a single transaction for the actual migration script and the essential bookeeping so we never
// execute migrations twice. See https://github.com/launchbadge/sqlx/issues/1966.
let mut tx = self.begin().await?;
let start = Instant::now();
let _ = tx.execute(&*migration.sql).await?;
// language=SQL
let _ = query(r#"DELETE FROM _sqlx_migrations WHERE version = $1"#)
.bind(migration.version)
.execute(&mut *tx)
.await?;
tx.commit().await?;
// execute migration queries
if migration.no_tx {
revert_migration(self, migration).await?;
} else {
// Use a single transaction for the actual migration script and the essential bookeeping so we never
// execute migrations twice. See https://github.com/launchbadge/sqlx/issues/1966.
let mut tx = self.begin().await?;
revert_migration(&mut tx, migration).await?;
tx.commit().await?;
}
let elapsed = start.elapsed();
@ -299,6 +297,24 @@ async fn execute_migration(
Ok(())
}
async fn revert_migration(
conn: &mut PgConnection,
migration: &Migration,
) -> Result<(), MigrateError> {
let _ = conn
.execute(&*migration.sql)
.await
.map_err(|e| MigrateError::ExecuteMigration(e, migration.version))?;
// language=SQL
let _ = query(r#"DELETE FROM _sqlx_migrations WHERE version = $1"#)
.bind(migration.version)
.execute(conn)
.await?;
Ok(())
}
async fn current_database(conn: &mut PgConnection) -> Result<String, MigrateError> {
// language=SQL
Ok(query_scalar("SELECT current_database()")