caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FromQueryResult proc_macro no longer add TryGetable trait bound to generic types (#1603)

Browse Source 
* `FromQueryResult` proc_macro no longer add `TryGetable` trait bound to generic types

* clippy
This commit is contained in:
Billy Chan 2023-04-24 11:34:35 +08:00 committed by GitHub
parent 87998fdf49
commit b2d78d43da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sea-orm-macros/src/derives/from_query_result.rs
View File

@ -1,12 +1,12 @@
use proc_macro2::{Ident, TokenStream}; use proc_macro2::{Ident, TokenStream};
use quote::{format_ident, quote, quote_spanned}; use quote::{format_ident, quote, quote_spanned};
use syn::{ext::IdentExt, parse_quote, Data, DataStruct, Field, Fields, GenericParam, Generics}; use syn::{ext::IdentExt, Data, DataStruct, Field, Fields, Generics};
/// Method to derive a [QueryResult](sea_orm::QueryResult) /// Method to derive a [QueryResult](sea_orm::QueryResult)
pub fn expand_derive_from_query_result( pub fn expand_derive_from_query_result(
ident: Ident, ident: Ident,
data: Data, data: Data,
mut generics: Generics, generics: Generics,
) -> syn::Result<TokenStream> { ) -> syn::Result<TokenStream> {
let fields = match data { let fields = match data {
Data::Struct(DataStruct { Data::Struct(DataStruct {
@ -33,11 +33,6 @@ pub fn expand_derive_from_query_result(
}) })
.collect(); .collect();
for param in &mut generics.params {
if let GenericParam::Type(type_param) = param {
type_param.bounds.push(parse_quote!(sea_orm::TryGetable));
}
}
let (impl_generics, ty_generics, where_clause) = generics.split_for_impl(); let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
Ok(quote!( Ok(quote!(

24
tests/derive_tests.rs
View File

@ -7,26 +7,26 @@ struct SimpleTest {
} }
#[derive(FromQueryResult)] #[derive(FromQueryResult)]
struct GenericTest<T> { struct GenericTest<T: TryGetable> {
_foo: i32, _foo: i32,
_bar: T, _bar: T,
} }
#[derive(FromQueryResult)] #[derive(FromQueryResult)]
struct DoubleGenericTest<T, F> { struct DoubleGenericTest<T: TryGetable, F: TryGetable> {
_foo: T, _foo: T,
_bar: F, _bar: F,
} }
#[derive(FromQueryResult)] #[derive(FromQueryResult)]
struct BoundsGenericTest<T: Copy + Clone + 'static> { struct BoundsGenericTest<T: TryGetable + Copy + Clone + 'static> {
_foo: T, _foo: T,
} }
#[derive(FromQueryResult)] #[derive(FromQueryResult)]
struct WhereGenericTest<T> struct WhereGenericTest<T>
where where
T: Copy + Clone + 'static, T: TryGetable + Copy + Clone + 'static,
{ {
_foo: T, _foo: T,
} }
@ -37,10 +37,22 @@ struct AlreadySpecifiedBoundsGenericTest<T: TryGetable> {
} }
#[derive(FromQueryResult)] #[derive(FromQueryResult)]
struct MixedGenericTest<T: Clone, F> struct MixedGenericTest<T: TryGetable + Clone, F>
where where
F: Copy + Clone + 'static, F: TryGetable + Copy + Clone + 'static,
{ {
_foo: T, _foo: T,
_bar: F, _bar: F,
} }
trait MyTrait {
type Item: TryGetable;
}
#[derive(FromQueryResult)]
struct TraitAssociateTypeTest<T>
where
T: MyTrait,
{
_foo: T::Item,
}