itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-05 16:54:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(macros): fix broken _unchecked macros

Browse Source 
These should all expand to invocations of `expand_query!()` but I guess I missed a couple.

Closes #503

Signed-off-by: Austin Bonander <austin@launchbadge.com>
This commit is contained in:
Austin Bonander 2020-07-09 12:59:49 -07:00 committed by Ryan Leckey
parent e731836e48
commit c327e63f46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/macros.rs
View File

@ -363,14 +363,14 @@ macro_rules! query_file_unchecked (
($path:literal) => (#[allow(dead_code)]{ ($path:literal) => (#[allow(dead_code)]{
#[macro_use] #[macro_use]
mod _macro_result { 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!() macro_result!()
}); });
($path:literal, $($args:expr),*$(,)?) => (#[allow(dead_code)]{ ($path:literal, $($args:expr),*$(,)?) => (#[allow(dead_code)]{
#[macro_use] #[macro_use]
mod _macro_result { 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),*) macro_result!($($args),*)
}) })
@ -560,7 +560,7 @@ macro_rules! query_file_as_unchecked (
($out_struct:path, $path:literal) => (#[allow(dead_code)] { ($out_struct:path, $path:literal) => (#[allow(dead_code)] {
#[macro_use] #[macro_use]
mod _macro_result { 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!() macro_result!()
}); });
@ -568,7 +568,7 @@ macro_rules! query_file_as_unchecked (
($out_struct:path, $path:literal, $($args:tt),*$(,)?) => (#[allow(dead_code)] { ($out_struct:path, $path:literal, $($args:tt),*$(,)?) => (#[allow(dead_code)] {
#[macro_use] #[macro_use]
mod _macro_result { 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),*) macro_result!($($args),*)
}) })