itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-03 07:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(macros): support wildcard in bind param type overrides

Browse Source
This commit is contained in:
Austin Bonander 2020-06-10 21:03:36 -07:00 committed by Ryan Leckey
parent eb831382e5
commit 14023e8e6e
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sqlx-macros/src/query/args.rs
View File

@ -1,6 +1,6 @@
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use syn::spanned::Spanned; use syn::spanned::Spanned;
use syn::Expr; use syn::{Expr, Type};
use quote::{quote, quote_spanned, ToTokens}; use quote::{quote, quote_spanned, ToTokens};
use sqlx_core::describe::Describe; use sqlx_core::describe::Describe;
@ -34,14 +34,12 @@ pub fn quote_args<DB: DatabaseExt>(
// TODO: We could remove the ParamChecking flag and just filter to only test params that are non-null // TODO: We could remove the ParamChecking flag and just filter to only test params that are non-null
let param_ty = param_ty.as_ref().unwrap(); let param_ty = param_ty.as_ref().unwrap();
let param_ty = get_type_override(expr) let param_ty = match get_type_override(expr) {
.or_else(|| { // don't emit typechecking code for this binding
Some( Some(Type::Infer(_)) => return Ok(quote!()),
DB::param_type_for_id(&param_ty)? Some(ty) => ty.to_token_stream(),
.parse::<proc_macro2::TokenStream>() None => {
.unwrap(), DB::param_type_for_id(&param_ty)
)
})
.ok_or_else(|| { .ok_or_else(|| {
if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&param_ty) { if let Some(feature_gate) = <DB as DatabaseExt>::get_feature_gate(&param_ty) {
format!( format!(
@ -53,7 +51,12 @@ pub fn quote_args<DB: DatabaseExt>(
} else { } else {
format!("unsupported type {} for param #{}", param_ty, i + 1) format!("unsupported type {} for param #{}", param_ty, i + 1)
} }
})?; })?
.parse::<proc_macro2::TokenStream>()
.map_err(|_| format!("Rust type mapping for {} not parsable", param_ty))?
}
};
Ok(quote_spanned!(expr.span() => Ok(quote_spanned!(expr.span() =>
// this shouldn't actually run // this shouldn't actually run
@ -97,10 +100,11 @@ pub fn quote_args<DB: DatabaseExt>(
}) })
} }
fn get_type_override(expr: &Expr) -> Option<TokenStream> { fn get_type_override(expr: &Expr) -> Option<&Type> {
match expr { match expr {
Expr::Cast(cast) => Some(cast.ty.to_token_stream()), Expr::Group(group) => get_type_override(&group.expr),
Expr::Type(ascription) => Some(ascription.ty.to_token_stream()), Expr::Cast(cast) => Some(&cast.ty),
Expr::Type(ascription) => Some(&ascription.ty),
_ => None, _ => None,
} }
} }