More test fixes

Author: krlohnes

sqlx-cli/src/database.rs

@@ -62,7 +62,17 @@ pub async fn setup(
     connect_opts: &ConnectOpts,
 ) -> anyhow::Result<()> {
     create(connect_opts).await?;
-    migrate::run(config, migration_source, connect_opts, false, false, None).await
+    migrate::run(
+        config,
+        migration_source,
+        connect_opts,
+        false,
+        false,
+        None,
+        false,
+        Vec::new(),
+    )
+    .await
 }
 
 async fn ask_to_continue_drop(db_url: String) -> bool {

sqlx-cli/src/migrate.rs

@@ -293,10 +293,17 @@ pub async fn run(
                 let elapsed = if dry_run || skip {
                     Duration::new(0, 0)
                 } else if params_from_env {
-                    conn.apply(&migration.process_parameters(&env_params)?)
-                        .await?
+                    conn.apply(
+                        config.migrate.table_name(),
+                        &migration.process_parameters(&env_params)?,
+                    )
+                    .await?
                 } else if !params.is_empty() {
-                    conn.apply(&migration.process_parameters(&params)?).await?
+                    conn.apply(
+                        config.migrate.table_name(),
+                        &migration.process_parameters(&params)?,
+                    )
+                    .await?
                 } else {
                     conn.apply(config.migrate.table_name(), migration).await?
                 };
@@ -408,10 +415,17 @@ pub async fn revert(
             let elapsed = if dry_run || skip {
                 Duration::new(0, 0)
             } else if params_from_env {
-                conn.revert(&migration.process_parameters(&env_params)?)
-                    .await?
+                conn.revert(
+                    config.migrate.table_name(),
+                    &migration.process_parameters(&env_params)?,
+                )
+                .await?
             } else if !params.is_empty() {
-                conn.revert(&migration.process_parameters(&params)?).await?
+                conn.revert(
+                    config.migrate.table_name(),
+                    &migration.process_parameters(&params)?,
+                )
+                .await?
             } else {
                 conn.revert(config.migrate.table_name(), migration).await?
             };

sqlx-cli/src/opt.rs

@@ -2,7 +2,6 @@ use crate::config::migrate::{DefaultMigrationType, DefaultVersioning};
 use crate::config::Config;
 use anyhow::Context;
 use chrono::Utc;
-use std::error::Error;
 use clap::{
     builder::{styling::AnsiColor, Styles},
     Args, Parser,
@@ -11,6 +10,7 @@ use clap::{
 use clap_complete::Shell;
 use sqlx::migrate::{MigrateError, Migrator, ResolveWith};
 use std::env;
+use std::error::Error;
 use std::ops::{Deref, Not};
 use std::path::PathBuf;
 

sqlx-core/src/migrate/migration.rs

@@ -2,7 +2,7 @@ use sha2::{Digest, Sha384};
 use std::borrow::Cow;
 use std::collections::HashMap;
 
-use crate::sql_str::{SqlStr, SqlSafeStr};
+use crate::sql_str::{SqlSafeStr, SqlStr};
 
 use super::{MigrateError, MigrationType};
 

sqlx-core/src/migrate/migrator.rs

@@ -259,10 +259,14 @@ impl Migrator {
                 }
                 None => {
                     if self.template_parameters_from_env {
-                        conn.apply(&self.table_name, &migration.process_parameters(env_params.as_ref().unwrap())?)
-                            .await?;
+                        conn.apply(
+                            &self.table_name,
+                            &migration.process_parameters(env_params.as_ref().unwrap())?,
+                        )
+                        .await?;
                     } else if let Some(params) = self.template_params.as_ref() {
-                        conn.apply(&self.table_name, &migration.process_parameters(params)?).await?;
+                        conn.apply(&self.table_name, &migration.process_parameters(params)?)
+                            .await?;
                     } else {
                         conn.apply(&self.table_name, migration).await?;
                     }
@@ -339,10 +343,14 @@ impl Migrator {
             .filter(|m| m.version > target)
         {
             if self.template_parameters_from_env {
-                conn.revert(&self.table_name, &migration.process_parameters(env_params.as_ref().unwrap())?)
-                    .await?;
+                conn.revert(
+                    &self.table_name,
+                    &migration.process_parameters(env_params.as_ref().unwrap())?,
+                )
+                .await?;
             } else if let Some(params) = self.template_params.as_ref() {
-                conn.revert(&self.table_name, &migration.process_parameters(params)?).await?;
+                conn.revert(&self.table_name, &migration.process_parameters(params)?)
+                    .await?;
             } else {
                 conn.revert(&self.table_name, migration).await?;
             }

sqlx-macros/src/lib.rs

@@ -66,9 +66,9 @@ pub fn derive_from_row(input: TokenStream) -> TokenStream {
 #[cfg(feature = "migrate")]
 #[proc_macro]
 pub fn migrate(input: TokenStream) -> TokenStream {
+    use quote::quote;
     use std::collections::HashMap;
     use syn::{parse_macro_input, Expr, ExprArray, ExprLit, ExprPath, ExprTuple, Lit, LitStr};
-    use quote::quote;
 
     // Extract directory path, handling both direct literals and grouped literals
     fn extract_dir(expr: Option<Expr>) -> LitStr {