From c327e63f4675f9f6fae9125eb1fa4ce01632b061 Mon Sep 17 00:00:00 2001 From: Austin Bonander Date: Thu, 9 Jul 2020 12:59:49 -0700 Subject: [PATCH] fix(macros): fix broken `_unchecked` macros These should all expand to invocations of `expand_query!()` but I guess I missed a couple. Closes #503 Signed-off-by: Austin Bonander --- src/macros.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/macros.rs b/src/macros.rs index 0ea28f9c..6cb4e635 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -363,14 +363,14 @@ macro_rules! query_file_unchecked ( ($path:literal) => (#[allow(dead_code)]{ #[macro_use] mod _macro_result { - $crate::sqlx_macros::query_file_unchecked!(source_file = $path, checked = false); + $crate::sqlx_macros::expand_query!(source_file = $path, checked = false); } macro_result!() }); ($path:literal, $($args:expr),*$(,)?) => (#[allow(dead_code)]{ #[macro_use] mod _macro_result { - $crate::sqlx_macros::query_file_unchecked!(source_file = $path, args = [$($args),*], checked = false); + $crate::sqlx_macros::expand_query!(source_file = $path, args = [$($args),*], checked = false); } macro_result!($($args),*) }) @@ -560,7 +560,7 @@ macro_rules! query_file_as_unchecked ( ($out_struct:path, $path:literal) => (#[allow(dead_code)] { #[macro_use] mod _macro_result { - $crate::sqlx_macros::query_file_as_unchecked!(record = $out_struct, source_file = $path, checked = false); + $crate::sqlx_macros::expand_query!(record = $out_struct, source_file = $path, checked = false); } macro_result!() }); @@ -568,7 +568,7 @@ macro_rules! query_file_as_unchecked ( ($out_struct:path, $path:literal, $($args:tt),*$(,)?) => (#[allow(dead_code)] { #[macro_use] mod _macro_result { - $crate::sqlx_macros::query_file_as_unchecked!(record = $out_struct, source_file = $path, args = [$($args),*], checked = false); + $crate::sqlx_macros::expand_query!(record = $out_struct, source_file = $path, args = [$($args),*], checked = false); } macro_result!($($args),*) })