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

Refactor

Browse Source
This commit is contained in:
Chris Tsang 2021-05-18 00:23:56 +08:00
parent 7bf8ab0202
commit 2ea4be9350
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/query/helper.rs
View File

@ -149,16 +149,8 @@ pub trait QueryHelper: Sized {
/// Join via [`RelationDef`]. /// Join via [`RelationDef`].
fn join(mut self, join: JoinType, rel: RelationDef) -> Self { fn join(mut self, join: JoinType, rel: RelationDef) -> Self {
let from_tbl = rel.from_tbl.clone(); self.query()
let to_tbl = rel.to_tbl.clone(); .join(join, rel.to_tbl.clone(), join_condition(rel));
let owner_keys = rel.from_col;
let foreign_keys = rel.to_col;
let condition = match (owner_keys, foreign_keys) {
(Identity::Unary(o1), Identity::Unary(f1)) => {
Expr::tbl(Rc::clone(&from_tbl), o1).equals(Rc::clone(&to_tbl), f1)
} // _ => panic!("Owner key and foreign key mismatch"),
};
self.query().join(join, Rc::clone(&to_tbl), condition);
self self
} }
@ -166,16 +158,21 @@ pub trait QueryHelper: Sized {
/// Assume when there exist a relation A -> B. /// Assume when there exist a relation A -> B.
/// You can reverse join B <- A. /// You can reverse join B <- A.
fn join_rev(mut self, join: JoinType, rel: RelationDef) -> Self { fn join_rev(mut self, join: JoinType, rel: RelationDef) -> Self {
let from_tbl = rel.from_tbl.clone(); self.query()
let to_tbl = rel.to_tbl.clone(); .join(join, rel.from_tbl.clone(), join_condition(rel));
let owner_keys = rel.from_col;
let foreign_keys = rel.to_col;
let condition = match (owner_keys, foreign_keys) {
(Identity::Unary(o1), Identity::Unary(f1)) => {
Expr::tbl(Rc::clone(&from_tbl), o1).equals(Rc::clone(&to_tbl), f1)
} // _ => panic!("Owner key and foreign key mismatch"),
};
self.query().join(join, Rc::clone(&from_tbl), condition);
self self
} }
} }
fn join_condition(rel: RelationDef) -> SimpleExpr {
let from_tbl = rel.from_tbl.clone();
let to_tbl = rel.to_tbl.clone();
let owner_keys = rel.from_col;
let foreign_keys = rel.to_col;
match (owner_keys, foreign_keys) {
(Identity::Unary(o1), Identity::Unary(f1)) => {
Expr::tbl(Rc::clone(&from_tbl), o1).equals(Rc::clone(&to_tbl), f1)
} // _ => panic!("Owner key and foreign key mismatch"),
}
}