Merge pull request #1822 from Kobzol/db-migrations-tx

Use a transaction when applying migrations

src/db.rs

@@ -151,7 +151,7 @@ fn cert() {
     make_certificates();
 }
 
-pub async fn run_migrations(client: &DbClient) -> anyhow::Result<()> {
+pub async fn run_migrations(client: &mut DbClient) -> anyhow::Result<()> {
     client
         .execute(
             "CREATE TABLE IF NOT EXISTS database_versions (
@@ -182,17 +182,22 @@ pub async fn run_migrations(client: &DbClient) -> anyhow::Result<()> {
 
     for (idx, migration) in MIGRATIONS.iter().enumerate() {
         if idx >= migration_idx {
-            client
-                .execute(*migration, &[])
+            let tx = client
+                .transaction()
+                .await
+                .context("Cannot create migration transactin")?;
+            tx.execute(*migration, &[])
                 .await
                 .with_context(|| format!("executing {}th migration", idx))?;
-            client
-                .execute(
-                    "UPDATE database_versions SET migration_counter = $1",
-                    &[&(idx as i32 + 1)],
-                )
+            tx.execute(
+                "UPDATE database_versions SET migration_counter = $1",
+                &[&(idx as i32 + 1)],
+            )
+            .await
+            .with_context(|| format!("updating migration counter to {}", idx))?;
+            tx.commit()
                 .await
-                .with_context(|| format!("updating migration counter to {}", idx))?;
+                .context("Cannot commit migration transaction")?;
         }
     }
 

src/main.rs

@@ -243,7 +243,7 @@ async fn serve_req(
 
 async fn run_server(addr: SocketAddr) -> anyhow::Result<()> {
     let pool = db::ClientPool::new();
-    db::run_migrations(&*pool.get().await)
+    db::run_migrations(&mut *pool.get().await)
         .await
         .context("database migrations")?;