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-26 17:51:36 +08:00
parent 2ee376ddd1
commit db22e70c63
No known key found for this signature in database
GPG Key ID: A2D690CAC7DF3CC7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/query/insert.rs
View File

@ -3,7 +3,7 @@ use crate::{
PrimaryKeyTrait, QueryTrait, PrimaryKeyTrait, QueryTrait,
}; };
use core::marker::PhantomData; use core::marker::PhantomData;
use sea_query::{Expr, InsertStatement, SimpleExpr, ValueTuple}; use sea_query::{Expr, InsertStatement, ValueTuple};
#[derive(Debug)] #[derive(Debug)]
pub struct Insert<A> pub struct Insert<A>
@ -134,11 +134,11 @@ where
} }
if av_has_val { if av_has_val {
columns.push(col); columns.push(col);
let val = av.into_value().unwrap(); let val = Expr::val(av.into_value().unwrap());
let expr = if let Some(enum_name) = enum_name { let expr = if let Some(enum_name) = enum_name {
SimpleExpr::EnumValue(enum_name.to_owned(), Box::new(Expr::val(val).into())) Expr::enum_value(enum_name, val)
} else { } else {
Expr::val(val).into() val.into()
}; };
values.push(expr); values.push(expr);
} }

2
src/query/select.rs
View File

@ -121,7 +121,7 @@ where
let enum_name = col_def.get_column_type().get_enum_name(); let enum_name = col_def.get_column_type().get_enum_name();
let col_expr = Expr::tbl(table.clone(), col); let col_expr = Expr::tbl(table.clone(), col);
if enum_name.is_some() { if enum_name.is_some() {
SimpleExpr::EnumValue("text".to_owned(), Box::new(col_expr.into())) Expr::enum_value("text", col_expr)
} else { } else {
col_expr.into() col_expr.into()
} }

6
src/query/update.rs
View File

@ -108,11 +108,11 @@ where
let enum_name = col_def.get_column_type().get_enum_name(); let enum_name = col_def.get_column_type().get_enum_name();
let av = self.model.get(col); let av = self.model.get(col);
if av.is_set() { if av.is_set() {
let val = av.into_value().unwrap(); let val = Expr::val(av.into_value().unwrap());
let expr = if let Some(enum_name) = enum_name { let expr = if let Some(enum_name) = enum_name {
SimpleExpr::EnumValue(enum_name.to_owned(), Box::new(Expr::val(val).into())) Expr::enum_value(enum_name, val)
} else { } else {
Expr::val(val).into() val.into()
}; };
self.query.value_expr(col, expr); self.query.value_expr(col, expr);
} }