Mirrors/sqlx
2
0
Fork 0
mirror of https://github.com/launchbadge/sqlx synced 2024-11-12 23:37:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix non-overridden type name not being quoted

Browse source
This commit is contained in:
Jonas Platte 2021-02-04 13:49:21 +01:00 committed by Ryan Leckey
parent cf97315c74
commit c251ba1e12
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sqlx-macros/src/derives/type.rs
View file

@ -1,9 +1,9 @@
use super::attributes::{
check_strong_enum_attributes, check_struct_attributes, check_transparent_attributes,
check_weak_enum_attributes, parse_container_attributes,
check_weak_enum_attributes, parse_container_attributes, TypeName,
};
use proc_macro2::TokenStream;
use quote::quote;
use proc_macro2::{Ident, TokenStream};
use quote::{quote, quote_spanned};
use syn::punctuated::Punctuated;
use syn::token::Comma;
use syn::{
@ -86,10 +86,7 @@ fn expand_derive_has_sql_type_transparent(
let mut tts = TokenStream::new();
if cfg!(feature = "postgres") {
let ty_name = attr
.type_name
.map(|tn| tn.get())
.unwrap_or_else(|| quote! { #ident });
let ty_name = type_name(ident, attr.type_name.as_ref());
tts.extend(quote!(
impl ::sqlx::Type<::sqlx::postgres::Postgres> for #ident #ty_generics {
@ -148,10 +145,7 @@ fn expand_derive_has_sql_type_strong_enum(
}
if cfg!(feature = "postgres") {
let ty_name = attributes
.type_name
.map(|tn| tn.get())
.unwrap_or_else(|| quote! { #ident });
let ty_name = type_name(ident, attributes.type_name.as_ref());
tts.extend(quote!(
impl ::sqlx::Type<::sqlx::Postgres> for #ident {
@ -189,10 +183,7 @@ fn expand_derive_has_sql_type_struct(
let mut tts = TokenStream::new();
if cfg!(feature = "postgres") {
let ty_name = attributes
.type_name
.map(|tn| tn.get())
.unwrap_or_else(|| quote! { #ident });
let ty_name = type_name(ident, attributes.type_name.as_ref());
tts.extend(quote!(
impl ::sqlx::Type<::sqlx::Postgres> for #ident {
@ -205,3 +196,10 @@ fn expand_derive_has_sql_type_struct(
Ok(tts)
}
fn type_name(ident: &Ident, explicit_name: Option<&TypeName>) -> TokenStream {
explicit_name.map(|tn| tn.get()).unwrap_or_else(|| {
let s = ident.to_string();
quote_spanned!(ident.span()=> { #s })
})
}