Skip to content

Add ActiveHasMany Mutation (ability to delete) #3195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jacob-32587 wants to merge 13 commits into from
Closed

Add ActiveHasMany Mutation (ability to delete) #3195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
244022c
feat: added Mutation action for HasManyActive
Sep 4, 2026
ed73ce1
feat: removed complex into_iter, simplified by not including models m…
Sep 7, 2026
2f74bab
feat: using as_slice to check if a model exists by pk
Sep 7, 2026
be53ba9
feat: created function to delete an existing active model by pk, push…
Sep 7, 2026
b62b69f
feat: push will delete models marked as deleted if added with the sam…
Sep 7, 2026
89ca9b0
refactor: removed useless iter funciton
Sep 7, 2026
843de6b
docs: updated to account for new Mutate variant
Sep 7, 2026
afdaf56
fix: specify module for ValueTuple instead of use
Sep 7, 2026
ecf3a4b
feat: updated proc macro to includ delete_ and delete_existing functi…
Sep 7, 2026
fcdc8fc
test: created two tests for mutate
Sep 7, 2026
964d7cb
chore: make-sync
Sep 7, 2026
2cf41d4
docs: undo useless changes
Sep 7, 2026
a23b2dd
fix: specify sea_orm module for ValueTuple
Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 61 additions & 20 deletions sea-orm-macros/src/derives/active_model_ex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,17 +533,29 @@ impl<'a> ActiveModelSetter<'a> {
})
}
CompoundKind::HasMany => {
let setter = format_ident!(
"add_{}",
pluralizer::pluralize(&field_ident.to_string(), 1, false)
);
let plural_name = pluralizer::pluralize(&field_ident.to_string(), 1, false);
let setter = format_ident!("add_{}", plural_name);
let remove = format_ident!("delete_{}", plural_name);
let remove_existing = format_ident!("delete_existing_{}", plural_name);

Ok(quote! {
#[doc = " Generated by sea-orm-macros"]
pub fn #setter(mut self, v: impl Into<#active_model_type>) -> Self {
self.#field_ident.push(v.into());
self
}

#[doc = " Generated by sea-orm-macros"]
pub fn #remove(mut self, v: impl Into<#active_model_type>) -> Self {
self.#field_ident.push_delete(v.into());
self
}

#[doc = " Generated by sea-orm-macros"]
pub fn #remove_existing(mut self, v: impl std::borrow::Borrow<sea_orm::sea_query::ValueTuple>) -> Self {
self.#field_ident.push_delete_existing(v.borrow());
self
}
})
}
}
Expand Down Expand Up @@ -1227,7 +1239,6 @@ impl HasManySelfField<'_> {
let relation_variant = quote!(Relation::#relation_variant);

let delete_associated_model = quote! {
let mut item = item.into_active_model();
if item.clear_parent_key_for_self_rev(#relation_variant)? {
item.update(db)#await_?;
} else {
Expand All @@ -1237,16 +1248,27 @@ impl HasManySelfField<'_> {
};

let has_many_before_action = quote! {
let #field_binding = self.#ident.take();
let mut #field_binding = self.#ident.take();
};

let has_many_action = quote! {
if #field_binding.is_replace() {
for item in model.find_belongs_to_self(#relation_variant, db.get_database_backend())?.all(db)#await_? {
if !#field_binding.find(&item) {
match #field_binding {
ActiveHasMany::Replace(_) => {
for item in model.find_belongs_to_self(#relation_variant, db.get_database_backend())?.all(db)#await_? {
if !#field_binding.find(&item) {
let mut item = item.into_active_model();
#delete_associated_model
}
}
},
ActiveHasMany::Mutate(ref mut mutations) => {
let deletes = std::mem::take(mutations.delete_as_mut_vec());
for item in deletes {
let mut item: self::ActiveModel = item.into();
#delete_associated_model
}
}
},
_ => ()
}
model.#ident = #field_binding.empty_holder();
for mut #field_binding in #field_binding.into_vec() {
Expand All @@ -1262,6 +1284,7 @@ impl HasManySelfField<'_> {

let has_many_delete = quote! {
for item in self.find_belongs_to_self(#relation_variant, db.get_database_backend())?.all(db)#await_? {
let mut item = item.into_active_model();
#delete_associated_model
}
};
Expand Down Expand Up @@ -1352,7 +1375,7 @@ impl HasManyField<'_> {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
quote! {
let #field_binding = self.#ident.take();
let mut #field_binding = self.#ident.take();
}
}

Expand All @@ -1366,21 +1389,39 @@ impl HasManyField<'_> {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let related_entity = self.entity;
let delete_associated_model = quote! {
let mut item = item.into_active_model();
if item.clear_parent_key::<Entity>()? {
item.update(db)#await_?;
let delete_associated_model_gen = |into_ex: bool| {
let merge_tokens = if into_ex {
quote! { item.into_ex().delete(db)#await_? }
} else {
deleted.merge(item.into_ex().delete(db)#await_?); // deep delete
quote! { item.delete(db)#await_? }
};
quote! {
if item.clear_parent_key::<Entity>()? {
item.update(db)#await_?;
} else {
deleted.merge(#merge_tokens); // deep delete
}
}
};
let delete_associated_model_into_ex = delete_associated_model_gen(true);
let delete_associated_model = delete_associated_model_gen(false);
quote! {
if #field_binding.is_replace() {
for item in model.find_related(#related_entity).all(db)#await_? {
if !#field_binding.find(&item) {
match #field_binding {
ActiveHasMany::Replace(_) => {
for item in model.find_related(#related_entity).all(db)#await_? {
if !#field_binding.find(&item) {
let mut item = item.into_active_model();
#delete_associated_model_into_ex
}
}
},
ActiveHasMany::Mutate(ref mut mutations) => {
let deletes = std::mem::take(mutations.delete_as_mut_vec());
for mut item in deletes {
#delete_associated_model
}
}
},
_ => ()
}
model.#ident = #field_binding.empty_holder();
for mut #field_binding in #field_binding.into_vec() {
Expand Down
Loading