diff --git a/sqlx-macros/src/database/mod.rs b/sqlx-macros/src/database/mod.rs index 7b66db79..6fb362f5 100644 --- a/sqlx-macros/src/database/mod.rs +++ b/sqlx-macros/src/database/mod.rs @@ -73,7 +73,7 @@ macro_rules! impl_database_ext { } } - fn get_feature_gate($name: &Self::TypeInfo) -> Option<&'static str> { + fn get_feature_gate($ty_info: &Self::TypeInfo) -> Option<&'static str> { $get_gate } } diff --git a/sqlx-macros/src/query/mod.rs b/sqlx-macros/src/query/mod.rs index 68301f94..08ccece7 100644 --- a/sqlx-macros/src/query/mod.rs +++ b/sqlx-macros/src/query/mod.rs @@ -62,12 +62,15 @@ pub fn expand_input(input: QueryMacroInput) -> crate::Result { #[allow(unused_variables)] fn expand_from_db(input: QueryMacroInput, db_url: &str) -> crate::Result { + // FIXME: Introduce [sqlx::any::AnyConnection] and [sqlx::any::AnyDatabase] to support + // runtime determinism here + let db_url = Url::parse(db_url)?; match db_url.scheme() { #[cfg(feature = "postgres")] "postgres" | "postgresql" => { let data = block_on(async { - let mut conn = sqlx_core::postgres::PgConnection::connect(db_url).await?; + let mut conn = sqlx_core::postgres::PgConnection::connect(db_url.as_str()).await?; QueryData::from_db(&mut conn, &input.src).await })?; @@ -78,7 +81,7 @@ fn expand_from_db(input: QueryMacroInput, db_url: &str) -> crate::Result { let data = block_on(async { - let mut conn = sqlx_core::mysql::MySqlConnection::connect(db_url).await?; + let mut conn = sqlx_core::mysql::MySqlConnection::connect(db_url.as_str()).await?; QueryData::from_db(&mut conn, &input.src).await })?; @@ -89,7 +92,7 @@ fn expand_from_db(input: QueryMacroInput, db_url: &str) -> crate::Result { let data = block_on(async { - let mut conn = sqlx_core::sqlite::SqliteConnection::connect(db_url).await?; + let mut conn = sqlx_core::sqlite::SqliteConnection::connect(db_url.as_str()).await?; QueryData::from_db(&mut conn, &input.src).await })?;