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

Refactoring

Browse Source
This commit is contained in:
Billy Chan 2021-10-27 11:28:33 +08:00
parent a1f57ec0d2
commit e04495b94d
No known key found for this signature in database
GPG Key ID: A2D690CAC7DF3CC7
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/query/insert.rs
View File

@ -124,8 +124,6 @@ where
for (idx, col) in <A::Entity as EntityTrait>::Column::iter().enumerate() { for (idx, col) in <A::Entity as EntityTrait>::Column::iter().enumerate() {
let av = am.take(col); let av = am.take(col);
let av_has_val = av.is_set() || av.is_unchanged(); let av_has_val = av.is_set() || av.is_unchanged();
let col_def = col.def();
if columns_empty { if columns_empty {
self.columns.push(av_has_val); self.columns.push(av_has_val);
} else if self.columns[idx] != av_has_val { } else if self.columns[idx] != av_has_val {
@ -134,7 +132,7 @@ where
if av_has_val { if av_has_val {
columns.push(col); columns.push(col);
let val = Expr::val(av.into_value().unwrap()); let val = Expr::val(av.into_value().unwrap());
let expr = match col_def.get_column_type().get_enum_name() { let expr = match col.def().get_column_type().get_enum_name() {
Some(enum_name) => val.as_enum(Alias::new(enum_name)), Some(enum_name) => val.as_enum(Alias::new(enum_name)),
None => val.into(), None => val.into(),
}; };

3
src/query/select.rs
View File

@ -118,9 +118,8 @@ where
let text_type = SeaRc::new(Alias::new("text")) as DynIden; let text_type = SeaRc::new(Alias::new("text")) as DynIden;
E::Column::iter() E::Column::iter()
.map(|col| { .map(|col| {
let col_def = col.def();
let expr = Expr::tbl(table.clone(), col); let expr = Expr::tbl(table.clone(), col);
match col_def.get_column_type().get_enum_name() { match col.def().get_column_type().get_enum_name() {
Some(_) => expr.as_enum(text_type.clone()), Some(_) => expr.as_enum(text_type.clone()),
None => expr.into(), None => expr.into(),
} }

3
src/query/update.rs
View File

@ -104,11 +104,10 @@ where
if <A::Entity as EntityTrait>::PrimaryKey::from_column(col).is_some() { if <A::Entity as EntityTrait>::PrimaryKey::from_column(col).is_some() {
continue; continue;
} }
let col_def = col.def();
let av = self.model.get(col); let av = self.model.get(col);
if av.is_set() { if av.is_set() {
let val = Expr::val(av.into_value().unwrap()); let val = Expr::val(av.into_value().unwrap());
let expr = match col_def.get_column_type().get_enum_name() { let expr = match col.def().get_column_type().get_enum_name() {
Some(enum_name) => val.as_enum(Alias::new(enum_name)), Some(enum_name) => val.as_enum(Alias::new(enum_name)),
None => val.into(), None => val.into(),
}; };