Support nested entities #2508
Open
Support nested entities #2508
+1,064
−191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
feat: allow for recursive usage of FromQueryResult derive fix: fix tests to maintain API (even though probably should not..) fix: do not compile informative code snippet feat: allow nested attribute in DerivePartialModel feat: test cases and fixes for DerivePartialModel feat: enable DerivePartialModel for Option<T> fix: fix typos feat: update documentation fix: fix comment fix: remove unused import feat: add test and some fixes regarding option feat: properly differentiate same-name columns via explicit AS fix: cargo fmt fix: more formatting feat: more tests fix: reorganize tests fix: use - instead of _ to separate identifiers to avoid mixups fix: add comment explaining error handling in FromQueryResult derive feat: add aspirational test fix: remove eprintln chore: clippy
|
@jreppnow I rebased. seems like all tests are passing. I am still trying to reconcile the conflict on |
|
@Sytten @jreppnow thank you both of your contributions! I think we've came to a solution. In summary:
#[derive(DerivePartialModel)]
#[sea_orm(entity = "cake::Entity", from_query_result)]
struct Cake {
id: i32,
name: String,
#[sea_orm(nested)]
bakery: Option<Bakery>,
} |
tyt2y3
commented
Feb 23, 2025
tests/from_query_result_tests.rs
Outdated
Comment on lines
10
to
25
| #[derive(FromQueryResult)] | ||
| #[sea_orm(entity = "cake::Entity")] | ||
| struct Cake { | ||
| id: i32, | ||
| name: String, | ||
| #[sea_orm(nested)] | ||
| bakery: Option<CakeBakery>, | ||
| } | ||
|
|
||
| #[derive(FromQueryResult)] | ||
| struct CakeBakery { | ||
| #[sea_orm(from_alias = "bakery_id")] | ||
| id: i32, | ||
| #[sea_orm(from_alias = "bakery_name")] | ||
| title: String, | ||
| } |
tyt2y3
commented
Feb 23, 2025
Comment on lines
+105
to
+122
| let cake: Cake = cake::Entity::find() | ||
| .select_only() | ||
| .column(cake::Column::Id) | ||
| .column(cake::Column::Name) | ||
| .column_as(bakery::Column::Id, "bakery_id") | ||
| .column_as(bakery::Column::Name, "bakery_name") | ||
| .left_join(bakery::Entity) | ||
| .into_model() | ||
| .one(&ctx.db) | ||
| .await | ||
| .expect("succeeds to get the result") | ||
| .expect("exactly one model in DB"); | ||
|
|
||
| assert_eq!(cake.id, 13); | ||
| assert_eq!(cake.name, "Test Cake"); | ||
| let bakery = cake.bakery.unwrap(); | ||
| assert_eq!(bakery.id, 42); | ||
| assert_eq!(bakery.title, "cool little bakery"); |
tyt2y3
commented
Feb 23, 2025
Comment on lines
+76
to
+93
| #[derive(FromQueryResult, DerivePartialModel)] | ||
| #[sea_orm(entity = "bakery::Entity")] | ||
| struct Bakery { | ||
| id: i32, | ||
| #[sea_orm(from_col = "Name")] | ||
| title: String, | ||
| } | ||
|
|
||
| #[derive(DerivePartialModel)] | ||
| #[sea_orm(entity = "cake::Entity", from_query_result)] | ||
| struct Cake { | ||
| id: i32, | ||
| name: String, | ||
| #[sea_orm(nested)] | ||
| bakery: Option<Bakery>, | ||
| #[sea_orm(skip)] | ||
| ignore: Ignore, | ||
| } |
There was a problem hiding this comment.
DerivePartialModel + FromQueryResult
tyt2y3
commented
Feb 23, 2025
Comment on lines
+159
to
+170
| let cake: Cake = cake::Entity::find() | ||
| .left_join(bakery::Entity) | ||
| .into_partial_model() | ||
| .one(&ctx.db) | ||
| .await | ||
| .expect("succeeds to get the result") | ||
| .expect("exactly one model in DB"); | ||
|
|
||
| assert_eq!(cake.id, 13); | ||
| assert_eq!(cake.name, "Test Cake"); | ||
| assert!(matches!(cake.bakery, Some(Bakery { id: 42, .. }))); | ||
| assert_eq!(cake.bakery.unwrap().title, "cool little bakery"); |
|
would appreciate if you guys can review and add some test cases |
4 tasks
|
@Sytten works for you? |
|
Yeah works for me, sorry I am sick so didnt have chance to look into more details |
|
Sytten, thank you, and take care! |
tyt2y3
commented
Feb 25, 2025
Comment on lines
+78
to
+84
| #[derive(FromQueryResult, DerivePartialModel)] | ||
| #[sea_orm(entity = "bakery::Entity")] | ||
| struct Bakery { | ||
| id: i32, | ||
| #[sea_orm(from_col = "Name")] | ||
| title: String, | ||
| } |
There was a problem hiding this comment.
@Goodjooy since you're also a contributor. I realised we've made a small breaking change here, the from_col expression changed from snake_cake to TypeCase, corresponding to the variants of the Column enum directly. may be this is more consistent from a design sense? because this will work even when the entity has the column name re-mapped.
what's your view?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cont'd #2179