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

Use input ident instead of associated type projections in ActiveModel derive (#2349)

Browse Source 
* Use input ident instead of associated type projections in ActiveModel derive

* Add a test
This commit is contained in:
Jonas Platte 2024-10-25 12:04:35 +02:00 committed by GitHub
parent 647c93c464
commit ead131d937
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sea-orm-macros/src/derives/active_model.rs
View File

@ -22,8 +22,8 @@ pub fn expand_derive_active_model(ident: Ident, data: Data) -> syn::Result<Token
}
.into_iter();
let derive_active_model = derive_active_model(all_fields.clone())?;
let derive_into_model = derive_into_model(all_fields)?;
let derive_active_model = derive_active_model(&ident, all_fields.clone())?;
let derive_into_model = derive_into_model(&ident, all_fields)?;
Ok(quote!(
#derive_active_model
@ -31,7 +31,7 @@ pub fn expand_derive_active_model(ident: Ident, data: Data) -> syn::Result<Token
))
}
fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream> {
fn derive_active_model(ident: &Ident, all_fields: IntoIter<Field>) -> syn::Result<TokenStream> {
let fields = all_fields.filter(field_not_ignored);
let field: Vec<Ident> = fields.clone().map(format_field_ident).collect();
@ -87,8 +87,8 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
}
#[automatically_derived]
impl std::convert::From<<Entity as sea_orm::EntityTrait>::Model> for ActiveModel {
fn from(m: <Entity as sea_orm::EntityTrait>::Model) -> Self {
impl std::convert::From<#ident> for ActiveModel {
fn from(m: #ident) -> Self {
Self {
#(#field: sea_orm::ActiveValue::unchanged(m.#field)),*
}
@ -96,7 +96,7 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
}
#[automatically_derived]
impl sea_orm::IntoActiveModel<ActiveModel> for <Entity as sea_orm::EntityTrait>::Model {
impl sea_orm::IntoActiveModel<ActiveModel> for #ident {
fn into_active_model(self) -> ActiveModel {
self.into()
}
@ -161,7 +161,7 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
))
}
fn derive_into_model(model_fields: IntoIter<Field>) -> syn::Result<TokenStream> {
fn derive_into_model(ident: &Ident, model_fields: IntoIter<Field>) -> syn::Result<TokenStream> {
let active_model_fields = model_fields.clone().filter(field_not_ignored);
let active_model_field: Vec<Ident> = active_model_fields
@ -192,7 +192,7 @@ fn derive_into_model(model_fields: IntoIter<Field>) -> syn::Result<TokenStream>
Ok(quote!(
#[automatically_derived]
impl std::convert::TryFrom<ActiveModel> for <Entity as sea_orm::EntityTrait>::Model {
impl std::convert::TryFrom<ActiveModel> for #ident {
type Error = sea_orm::DbErr;
fn try_from(a: ActiveModel) -> Result<Self, sea_orm::DbErr> {
#(if matches!(a.#active_model_field, sea_orm::ActiveValue::NotSet) {
@ -207,8 +207,8 @@ fn derive_into_model(model_fields: IntoIter<Field>) -> syn::Result<TokenStream>
}
#[automatically_derived]
impl sea_orm::TryIntoModel<<Entity as sea_orm::EntityTrait>::Model> for ActiveModel {
fn try_into_model(self) -> Result<<Entity as sea_orm::EntityTrait>::Model, sea_orm::DbErr> {
impl sea_orm::TryIntoModel<#ident> for ActiveModel {
fn try_into_model(self) -> Result<#ident, sea_orm::DbErr> {
self.try_into()
}
}

15
tests/impl_from_for_active_model.rs Normal file
View File

@ -0,0 +1,15 @@
use sea_orm::{tests_cfg::cake, Set};
struct Cake {
id: i32,
name: String,
}
impl From<Cake> for cake::ActiveModel {
fn from(value: Cake) -> Self {
Self {
id: Set(value.id),
name: Set(value.name),
}
}
}