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

Skip implementing Related if the same related entity is being referenced by a conjunct relation (#1298)

Browse Source
This commit is contained in:
Billy Chan 2022-12-17 12:52:04 +08:00 committed by GitHub
parent 7757a46c46
commit 8982d88774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sea-orm-codegen/src/entity/base_entity.rs
View File

@ -204,6 +204,7 @@ mod tests {
on_update: Some(ForeignKeyAction::Cascade), on_update: Some(ForeignKeyAction::Cascade),
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
Relation { Relation {
ref_table: "filling".to_owned(), ref_table: "filling".to_owned(),
@ -214,6 +215,7 @@ mod tests {
on_update: Some(ForeignKeyAction::Cascade), on_update: Some(ForeignKeyAction::Cascade),
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
], ],
conjunct_relations: vec![], conjunct_relations: vec![],

5
sea-orm-codegen/src/entity/relation.rs
View File

@ -23,6 +23,7 @@ pub struct Relation {
pub(crate) on_delete: Option<ForeignKeyAction>, pub(crate) on_delete: Option<ForeignKeyAction>,
pub(crate) self_referencing: bool, pub(crate) self_referencing: bool,
pub(crate) num_suffix: usize, pub(crate) num_suffix: usize,
pub(crate) impl_related: bool,
} }
impl Relation { impl Relation {
@ -178,6 +179,7 @@ impl From<&TableForeignKey> for Relation {
on_update, on_update,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
} }
} }
} }
@ -199,6 +201,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
Relation { Relation {
ref_table: "filling".to_owned(), ref_table: "filling".to_owned(),
@ -209,6 +212,7 @@ mod tests {
on_update: Some(ForeignKeyAction::Cascade), on_update: Some(ForeignKeyAction::Cascade),
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
Relation { Relation {
ref_table: "filling".to_owned(), ref_table: "filling".to_owned(),
@ -219,6 +223,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
] ]
} }

10
sea-orm-codegen/src/entity/transformer.rs
View File

@ -197,6 +197,16 @@ impl EntityTransformer {
} }
for (tbl_name, mut conjunct_relations) in conjunct_relations.into_iter() { for (tbl_name, mut conjunct_relations) in conjunct_relations.into_iter() {
if let Some(entity) = entities.get_mut(&tbl_name) { if let Some(entity) = entities.get_mut(&tbl_name) {
for relation in entity.relations.iter_mut() {
// Skip `impl Related ... { fn to() ... }` implementation block,
// if the same related entity is being referenced by a conjunct relation
if conjunct_relations
.iter()
.any(|conjunct_relation| conjunct_relation.to == relation.ref_table)
{
relation.impl_related = false;
}
}
entity.conjunct_relations.append(&mut conjunct_relations); entity.conjunct_relations.append(&mut conjunct_relations);
} }
} }

15
sea-orm-codegen/src/entity/writer.rs
View File

@ -490,7 +490,7 @@ impl EntityWriter {
entity entity
.relations .relations
.iter() .iter()
.filter(|rel| !rel.self_referencing && rel.num_suffix == 0) .filter(|rel| !rel.self_referencing && rel.num_suffix == 0 && rel.impl_related)
.map(|rel| { .map(|rel| {
let enum_name = rel.get_enum_name(); let enum_name = rel.get_enum_name();
let module_name = rel.get_module_name(); let module_name = rel.get_module_name();
@ -707,6 +707,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}], }],
conjunct_relations: vec![ConjunctRelation { conjunct_relations: vec![ConjunctRelation {
via: "cake_filling".to_owned(), via: "cake_filling".to_owned(),
@ -744,6 +745,7 @@ mod tests {
on_update: Some(ForeignKeyAction::Cascade), on_update: Some(ForeignKeyAction::Cascade),
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
Relation { Relation {
ref_table: "filling".to_owned(), ref_table: "filling".to_owned(),
@ -754,6 +756,7 @@ mod tests {
on_update: Some(ForeignKeyAction::Cascade), on_update: Some(ForeignKeyAction::Cascade),
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
], ],
conjunct_relations: vec![], conjunct_relations: vec![],
@ -828,6 +831,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
Relation { Relation {
ref_table: "vendor".to_owned(), ref_table: "vendor".to_owned(),
@ -838,6 +842,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
], ],
conjunct_relations: vec![], conjunct_relations: vec![],
@ -879,6 +884,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}], }],
conjunct_relations: vec![], conjunct_relations: vec![],
primary_keys: vec![PrimaryKey { primary_keys: vec![PrimaryKey {
@ -990,6 +996,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: true, self_referencing: true,
num_suffix: 1, num_suffix: 1,
impl_related: true,
}, },
Relation { Relation {
ref_table: "rust_keyword".to_owned(), ref_table: "rust_keyword".to_owned(),
@ -1000,6 +1007,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: true, self_referencing: true,
num_suffix: 2, num_suffix: 2,
impl_related: true,
}, },
Relation { Relation {
ref_table: "fruit".to_owned(), ref_table: "fruit".to_owned(),
@ -1010,6 +1018,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 1, num_suffix: 1,
impl_related: true,
}, },
Relation { Relation {
ref_table: "fruit".to_owned(), ref_table: "fruit".to_owned(),
@ -1020,6 +1029,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 2, num_suffix: 2,
impl_related: true,
}, },
Relation { Relation {
ref_table: "cake".to_owned(), ref_table: "cake".to_owned(),
@ -1030,6 +1040,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}, },
], ],
conjunct_relations: vec![], conjunct_relations: vec![],
@ -1071,6 +1082,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}], }],
conjunct_relations: vec![ConjunctRelation { conjunct_relations: vec![ConjunctRelation {
via: "cake_filling".to_owned(), via: "cake_filling".to_owned(),
@ -1114,6 +1126,7 @@ mod tests {
on_update: None, on_update: None,
self_referencing: false, self_referencing: false,
num_suffix: 0, num_suffix: 0,
impl_related: true,
}], }],
conjunct_relations: vec![ConjunctRelation { conjunct_relations: vec![ConjunctRelation {
via: "cake_filling".to_owned(), via: "cake_filling".to_owned(),