Skip to content

Macro hygiene #3185

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

Merged
Huliiiiii merged 2 commits into from
Aug 25, 2026
Merged

Macro hygiene #3185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2f9258
Fix codegen and macro edge cases (#3158)
k-bx Aug 8, 2026
a22a7ca
Improve derive macro hygiene to prevent generated identifier conflicts
Huliiiiii Aug 25, 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
2 changes: 1 addition & 1 deletion sea-orm-macros/src/derives/active_enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ impl ActiveEnum {
impl std::convert::TryFrom<&str> for #ident {
type Error = sea_orm::DbErr;

fn try_from(source: &str) -> std::result::Result<Self, Self::Error> {
fn try_from(source: &str) -> std::result::Result<Self, sea_orm::DbErr> {
match source {
#( #variant_values => Ok(Self::#variant_idents), )*
_ => Err(sea_orm::DbErr::Type(format!(
Expand Down
73 changes: 41 additions & 32 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 @@ -3,7 +3,8 @@ use super::attributes::compound_attr;
use super::model_ex::infer_relation_name_from_entity;
use super::util::{
CardinalityKind, CompoundKind, CompoundType, Junction, RelationColumns, async_token,
await_token, consume_meta, escape_rust_keyword, is_self_entity, trim_starting_raw_identifier,
await_token, clone_with_mixed_site_span, consume_meta, escape_rust_keyword, is_self_entity,
trim_starting_raw_identifier,
};
use heck::ToUpperCamelCase;
use proc_macro2::{Ident, Span, TokenStream};
Expand Down Expand Up @@ -1018,6 +1019,7 @@ impl BelongsToField<'_> {
cardinality: CardinalityKind,
) -> syn::Result<()> {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let related_entity = &self.compound_type.entity;
let save_model = self.save_related_model();
let from_columns = self.from;
Expand Down Expand Up @@ -1058,25 +1060,26 @@ impl BelongsToField<'_> {
};

output.belongs_to_action.extend(quote! {
let #ident = match self.#ident.take() {
let #field_binding = match self.#ident.take() {
ActiveBelongsTo::NotSet => ActiveBelongsTo::NotSet,
#action_arms
};
});
output.belongs_to_after_action.extend(quote! {
if #ident.is_set() {
model.#ident = #ident;
if #field_binding.is_set() {
model.#ident = #field_binding;
}
});
Ok(())
}

fn expand_active_has_one_into(&self, output: &mut ActiveModelActionTokens) {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let save_model = self.save_related_model();

output.belongs_to_action.extend(quote! {
let #ident = match std::mem::take(&mut self.#ident) {
let #field_binding = match std::mem::take(&mut self.#ident) {
ActiveHasOne::Set(Some(model)) => {
#save_model
Some(model)
Expand All @@ -1086,8 +1089,8 @@ impl BelongsToField<'_> {
};
});
output.belongs_to_after_action.extend(quote! {
if let Some(#ident) = #ident {
model.#ident = ActiveHasOne::set(Some(#ident));
if let Some(#field_binding) = #field_binding {
model.#ident = ActiveHasOne::set(Some(#field_binding));
}
});
}
Expand All @@ -1114,8 +1117,9 @@ struct HasOneField<'a> {
impl HasOneField<'_> {
fn has_one_before_action(&self) -> TokenStream {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
quote! {
let #ident = std::mem::take(&mut self.#ident);
let #field_binding = std::mem::take(&mut self.#ident);
}
}

Expand All @@ -1135,6 +1139,7 @@ impl HasOneField<'_> {
}
};
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let related_entity = self.entity;

let delete_existing_child = quote! {
Expand All @@ -1158,7 +1163,7 @@ impl HasOneField<'_> {
};

quote! {
match #ident {
match #field_binding {
ActiveHasOne::NotSet => {}
ActiveHasOne::Set(Some(child)) => {
let mut child = *child;
Expand Down Expand Up @@ -1216,6 +1221,7 @@ impl HasManySelfField<'_> {
quote!()
};
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let relation_variant =
Ident::new(&self.relation_variant.value(), self.relation_variant.span());
let relation_variant = quote!(Relation::#relation_variant);
Expand All @@ -1231,26 +1237,26 @@ impl HasManySelfField<'_> {
};

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

let has_many_action = quote! {
if #ident.is_replace() {
if #field_binding.is_replace() {
for item in model.find_belongs_to_self(#relation_variant, db.get_database_backend())?.all(db)#await_? {
if !#ident.find(&item) {
if !#field_binding.find(&item) {
#delete_associated_model
}
}
}
model.#ident = #ident.empty_holder();
for mut #ident in #ident.into_vec() {
#ident.set_parent_key_for_self_rev(&model, #relation_variant)?;
let #ident = if #ident.is_changed() {
#box_pin(#ident.action(action, db))#await_?
model.#ident = #field_binding.empty_holder();
for mut #field_binding in #field_binding.into_vec() {
#field_binding.set_parent_key_for_self_rev(&model, #relation_variant)?;
let #field_binding = if #field_binding.is_changed() {
#box_pin(#field_binding.action(action, db))#await_?
} else {
#ident
#field_binding
};
model.#ident.push(#ident);
model.#ident.push(#field_binding);
}
};

Expand Down Expand Up @@ -1286,6 +1292,7 @@ impl ManyToManyField<'_> {
quote!()
};
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
let junction_module = self.junction_module;
let junction_entity = quote!(super::#junction_module::Entity);
let (establish_links, delete_links) = match &self.kind {
Expand All @@ -1301,13 +1308,13 @@ impl ManyToManyField<'_> {
let delete_links = Ident::new(delete_links, ident.span());

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

let many_to_many_action = quote! {
model.#ident = #ident.empty_holder();
model.#ident = #field_binding.empty_holder();
// TODO: Batch save?
for item in #ident.into_vec() {
for item in #field_binding.into_vec() {
let item = if item.is_update() && !item.is_changed() {
item
} else {
Expand Down Expand Up @@ -1343,8 +1350,9 @@ struct HasManyField<'a> {
impl HasManyField<'_> {
fn has_many_before_action(&self) -> TokenStream {
let ident = self.ident;
let field_binding = clone_with_mixed_site_span(ident);
quote! {
let #ident = self.#ident.take();
let #field_binding = self.#ident.take();
}
}

Expand All @@ -1356,6 +1364,7 @@ impl HasManyField<'_> {
quote!()
};
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();
Expand All @@ -1366,22 +1375,22 @@ impl HasManyField<'_> {
}
};
quote! {
if #ident.is_replace() {
if #field_binding.is_replace() {
for item in model.find_related(#related_entity).all(db)#await_? {
if !#ident.find(&item) {
if !#field_binding.find(&item) {
#delete_associated_model
}
}
}
model.#ident = #ident.empty_holder();
for mut #ident in #ident.into_vec() {
#ident.set_parent_key(&model)?;
let #ident = if #ident.is_changed() {
#box_pin(#ident.action(action, db))#await_?
model.#ident = #field_binding.empty_holder();
for mut #field_binding in #field_binding.into_vec() {
#field_binding.set_parent_key(&model)?;
let #field_binding = if #field_binding.is_changed() {
#box_pin(#field_binding.action(action, db))#await_?
} else {
#ident
#field_binding
};
model.#ident.push(#ident);
model.#ident.push(#field_binding);
}
}
}
Expand Down
Loading
Loading