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

use syn:Error for error messages

Browse Source
This commit is contained in:
Tom Dohrmann 2020-03-19 13:42:46 +01:00
parent 9be1512833
commit bd7d85a03e
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sqlx-macros/src/query_macros/output.rs
View File

@ -1,4 +1,4 @@
use proc_macro2::{Ident, TokenStream}; use proc_macro2::{Ident, Span, TokenStream};
use quote::quote; use quote::quote;
use syn::Path; use syn::Path;
@ -45,9 +45,9 @@ pub fn columns_to_rust<DB: DatabaseExt>(describe: &Describe<DB>) -> crate::Resul
let ident = parse_ident(name)?; let ident = parse_ident(name)?;
let type_ = if let Some(type_info) = &column.type_info { let type_ = if let Some(type_info) = &column.type_info {
<DB as DatabaseExt>::return_type_for_id(&type_info) <DB as DatabaseExt>::return_type_for_id(&type_info).map_or_else(
.ok_or_else(|| { || {
if let Some(feature_gate) = let message = if let Some(feature_gate) =
<DB as DatabaseExt>::get_feature_gate(&type_info) <DB as DatabaseExt>::get_feature_gate(&type_info)
{ {
format!( format!(
@ -68,21 +68,24 @@ pub fn columns_to_rust<DB: DatabaseExt>(describe: &Describe<DB>) -> crate::Resul
name: column.name.as_deref() name: column.name.as_deref()
} }
) )
} };
})? syn::Error::new(Span::call_site(), message).to_compile_error()
.parse::<TokenStream>() },
.unwrap() |t| t.parse().unwrap(),
} else {
format!(
"database couldn't tell us the type of {col}; \
this can happen for columns that are the result of an expression",
col = DisplayColumn {
idx: i,
name: column.name.as_deref()
}
) )
.parse::<TokenStream>() } else {
.unwrap() syn::Error::new(
Span::call_site(),
format!(
"database couldn't tell us the type of {col}; \
this can happen for columns that are the result of an expression",
col = DisplayColumn {
idx: i,
name: column.name.as_deref()
}
),
)
.to_compile_error()
}; };
Ok(RustColumn { Ok(RustColumn {