From 660f23313e2c98dac84e7d6982887d097ec9c1ee Mon Sep 17 00:00:00 2001 From: Szepesi Tibor Date: Sat, 29 Jan 2022 18:14:23 +0100 Subject: [PATCH] Remove `r#` prefix from column name when field has a raw identifier --- sea-orm-macros/src/derives/from_query_result.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sea-orm-macros/src/derives/from_query_result.rs b/sea-orm-macros/src/derives/from_query_result.rs index dc6bbc44..6f36dcd8 100644 --- a/sea-orm-macros/src/derives/from_query_result.rs +++ b/sea-orm-macros/src/derives/from_query_result.rs @@ -1,6 +1,6 @@ use proc_macro2::{Ident, TokenStream}; use quote::{format_ident, quote, quote_spanned}; -use syn::{Data, DataStruct, Field, Fields}; +use syn::{ext::IdentExt, Data, DataStruct, Field, Fields}; /// Method to derive a [QueryResult](sea_orm::QueryResult) pub fn expand_derive_from_query_result(ident: Ident, data: Data) -> syn::Result { @@ -24,7 +24,7 @@ pub fn expand_derive_from_query_result(ident: Ident, data: Data) -> syn::Result< let name: Vec = field .iter() .map(|f| { - let s = f.to_string(); + let s = f.unraw().to_string(); quote! { #s } }) .collect();