itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-09-28 13:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

support string concatenation in query*

Browse Source
This commit is contained in:
Mike Ledger 2020-07-03 00:02:32 +10:00 committed by Austin Bonander
parent 2e3e5187f9
commit 0a74b16f4f
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sqlx-macros/src/query/input.rs
View File

@ -4,12 +4,13 @@ use std::fs;
use proc_macro2::{Ident, Span};
use quote::format_ident;
use syn::parse::{Parse, ParseStream};
use syn::{Expr, LitBool, LitStr};
use syn::{Expr, LitBool, LitStr, Token};
use syn::{ExprArray, Type};
/// Macro input shared by `query!()` and `query_file!()`
pub struct QueryMacroInput {
pub(super) src: String,
#[cfg_attr(not(feature = "offline"), allow(dead_code))]
pub(super) src_span: Span,
@ -51,8 +52,27 @@ impl Parse for QueryMacroInput {
let _ = input.parse::<syn::token::Eq>()?;
if key == "source" {
let lit_str = input.parse::<LitStr>()?;
query_src = Some((QuerySrc::String(lit_str.value()), lit_str.span()));
let mut fragments: Vec<LitStr> = Vec::new();
'source_parser: while !input.is_empty() {
if input.lookahead1().peek(LitStr) {
fragments.push(input.parse()?);
if input.lookahead1().peek(Token![+]) {
input.parse::<Token![+]>();
} else {
break 'source_parser;
}
} else {
break 'source_parser;
}
}
if fragments.len() == 0 {
return Err(syn::Error::new_spanned(key, "no source given"));
}
query_src = Some((
QuerySrc::String(fragments.iter().map(LitStr::value).collect()),
input.span(),
));
} else if key == "source_file" {
let lit_str = input.parse::<LitStr>()?;
query_src = Some((QuerySrc::File(lit_str.value()), lit_str.span()));

16
src/macros.rs
View File

@ -257,14 +257,14 @@
macro_rules! query (
// by emitting a macro definition from our proc-macro containing the result tokens,
// we no longer have a need for `proc-macro-hack`
($query:literal) => ({
($query:expr) => ({
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(source = $query);
}
macro_result!()
});
($query:literal, $($args:expr),*$(,)?) => ({
($query:expr, $($args:expr),*$(,)?) => ({
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(source = $query, args = [$($args),*]);
@ -278,14 +278,14 @@ macro_rules! query (
#[macro_export]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
macro_rules! query_unchecked (
($query:literal) => ({
($query:expr) => ({
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(source = $query, checked = false);
}
macro_result!()
});
($query:literal, $($args:expr),*$(,)?) => ({
($query:expr, $($args:expr),*$(,)?) => ({
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(source = $query, args = [$($args),*], checked = false);
@ -461,14 +461,14 @@ macro_rules! query_file_unchecked (
#[macro_export]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
macro_rules! query_as (
($out_struct:path, $query:literal) => (#[allow(dead_code)] {
($out_struct:path, $query:expr) => (#[allow(dead_code)] {
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(record = $out_struct, source = $query);
}
macro_result!()
});
($out_struct:path, $query:literal, $($args:expr),*$(,)?) => (#[allow(dead_code)] {
($out_struct:path, $query:expr, $($args:expr),*$(,)?) => (#[allow(dead_code)] {
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(record = $out_struct, source = $query, args = [$($args),*]);
@ -534,7 +534,7 @@ macro_rules! query_file_as (
#[macro_export]
#[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
macro_rules! query_as_unchecked (
($out_struct:path, $query:literal) => (#[allow(dead_code)] {
($out_struct:path, $query:expr) => (#[allow(dead_code)] {
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(record = $out_struct, source = $query, checked = false);
@ -542,7 +542,7 @@ macro_rules! query_as_unchecked (
macro_result!()
});
($out_struct:path, $query:literal, $($args:expr),*$(,)?) => (#[allow(dead_code)] {
($out_struct:path, $query:expr, $($args:expr),*$(,)?) => (#[allow(dead_code)] {
#[macro_use]
mod _macro_result {
$crate::sqlx_macros::expand_query!(record = $out_struct, source = $query, args = [$($args),*], checked = false);