Skip to content

Allow DerivePartialModel to have nested aliases #2686

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
tyt2y3 merged 13 commits into from
Aug 9, 2025
Merged

Allow DerivePartialModel to have nested aliases #2686

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
851f999
feta: Allow DerivePartialModel to add nested aliases and associate th…
Silence-kzp Jun 30, 2025
82ef8fd
fix left behind trailing whitespace.
Silence-kzp Jul 1, 2025
1ad7fc7
Add partial_model_nested_alias test case.
Silence-kzp Jul 1, 2025
029debc
feta: Allow DerivePartialModel to add nested aliases and associate th…
tyt2y3 Aug 8, 2025
10918b8
Fmt
Huliiiiii Aug 8, 2025
e415e66
Use fully qualified syntax on into_expr
Huliiiiii Aug 8, 2025
954c2a9
Fix
Huliiiiii Aug 9, 2025
1a5e3be
Fix the order of creating tables
Huliiiiii Aug 9, 2025
2347986
Clean up
Huliiiiii Aug 9, 2025
29e1c48
Refactor
Huliiiiii Aug 9, 2025
22756c7
Remove unnecessary code
tyt2y3 Aug 9, 2025
cff5d03
Merge .rustfmt.toml and rustfmt.toml
Huliiiiii Aug 9, 2025
86f8c4f
rename
tyt2y3 Aug 9, 2025
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
Prev Previous commit
Next Next commit
Refactor
  • Loading branch information
@Huliiiiii
Huliiiiii committed Aug 9, 2025
commit 29e1c48ceebd97af20ed64ca1fc46b3d0230b346
65 changes: 40 additions & 25 deletions sea-orm-macros/src/derives/partial_model.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,40 +259,55 @@ impl DerivePartialModel {
..
} = self;
let select_col_code_gen = fields.iter().map(|col_as| match col_as {
ColumnAs::Col { col, field} => {
ColumnAs::Col { col, field } => {
let field = field.unraw().to_string();
let entity = entity.as_ref().unwrap();
let col_name = if let Some(col) = col {

let col_as = if let Some(col) = col {
col
} else {
&format_ident!("{}", field.to_upper_camel_case())
};
let col_value = if let Some(alias) = alias {
quote!(if let Some(nested_alias) = nested_alias {
let alias_owned = sea_orm::sea_query::Alias::new(nested_alias);
let alias_iden = sea_orm::sea_query::DynIden::new(alias_owned);
sea_orm::sea_query::Expr::col((alias_iden, <#entity as sea_orm::EntityTrait>::Column:: #col_name))
} else {
sea_orm::sea_query::Expr::col((#alias, <#entity as sea_orm::EntityTrait>::Column:: #col_name))
})
} else {
quote!(if let Some(nested_alias) = nested_alias {
let alias_owned = sea_orm::sea_query::Alias::new(nested_alias);
let alias_iden = sea_orm::sea_query::DynIden::new(alias_owned);
sea_orm::sea_query::Expr::col((alias_iden, <#entity as sea_orm::EntityTrait>::Column:: #col_name))
} else {
::sea_orm::ColumnTrait::into_expr(<#entity as sea_orm::EntityTrait>::Column::#col_name)
})

let col_value = {
let col_expr = quote! {
<#entity as ::sea_orm::EntityTrait>::Column::#col_as
};

let non_nested = match alias {
Some(alias) => quote! {
::sea_orm::sea_query::Expr::col(
(#alias, #col_expr)
)
},
None => quote! {
::sea_orm::ColumnTrait::into_expr(#col_expr)
},
};

// TODO: Replace this with the new iden after updating to sea-query 1.0
quote! {
if let Some(nested_alias) = nested_alias {
let ident = ::sea_orm::sea_query::Alias::new(nested_alias);
let ident = ::sea_orm::sea_query::DynIden::new(ident);
::sea_orm::sea_query::Expr::col(
(ident, #col_expr)
)
} else {
#non_nested
}
}
};
quote!(let #select_ident =
if let Some(prefix) = pre {
let ident = format!("{prefix}{}", #field);
sea_orm::SelectColumns::select_column_as(#select_ident, #col_value, ident)
} else {
sea_orm::SelectColumns::select_column_as(#select_ident, #col_value, #field)

quote! {
let #select_ident = {
let ident = pre.map_or(#field.to_string(), |pre| format!("{pre}{}", #field));

::sea_orm::SelectColumns::select_column_as(#select_ident, #col_value, ident)
};
)
}
}

ColumnAs::Expr { expr, field } => {
let field = field.unraw().to_string();
quote!(let #select_ident =
Expand Down
1 change: 0 additions & 1 deletion tests/partial_model/nested_alias.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ async fn partial_model_nested_alias() {
worker::Entity::insert(worker::ActiveModel {
id: Set(1),
name: Set("Tom".to_owned()),

..Default::default()
})
.exec(&ctx.db)
Expand Down
Loading