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

ValueType does not need to impl Default

Browse Source
This commit is contained in:
Chris Tsang 2021-07-12 02:48:37 +08:00
parent a838cf7c23
commit 1e6a778a0f
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sea-orm-macros/src/derives/active_model.rs
View File

@ -71,7 +71,11 @@ pub fn expand_derive_active_model(ident: Ident, data: Data) -> syn::Result<Token
fn take(&mut self, c: <Self::Entity as EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> { fn take(&mut self, c: <Self::Entity as EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> {
match c { match c {
#(<Self::Entity as EntityTrait>::Column::#name => std::mem::take(&mut self.#field).into_wrapped_value(),)* #(<Self::Entity as EntityTrait>::Column::#name => {
let mut value = sea_orm::ActiveValue::unset();
std::mem::swap(&mut value, &mut self.#field);
value.into_wrapped_value()
},)*
_ => sea_orm::ActiveValue::unset(), _ => sea_orm::ActiveValue::unset(),
} }
} }

2
tests/bakery_chain/order.rs
View File

@ -17,7 +17,7 @@ pub struct Model {
pub total: Decimal, pub total: Decimal,
pub bakery_id: Option<i32>, pub bakery_id: Option<i32>,
pub customer_id: Option<i32>, pub customer_id: Option<i32>,
pub placed_at: Option<NaiveDateTime>, pub placed_at: NaiveDateTime,
} }
#[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)]

2
tests/crud/create_lineitem.rs
View File

@ -65,7 +65,7 @@ pub async fn test_create_lineitem(db: &DbConn) {
let order_1 = order::ActiveModel { let order_1 = order::ActiveModel {
bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)), bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)),
customer_id: Set(Some(customer_insert_res.last_insert_id as i32)), customer_id: Set(Some(customer_insert_res.last_insert_id as i32)),
placed_at: Set(Some(Utc::now().naive_utc())), placed_at: Set(Utc::now().naive_utc()),
..Default::default() ..Default::default()
}; };
let order_insert_res: InsertResult = Order::insert(order_1) let order_insert_res: InsertResult = Order::insert(order_1)

2
tests/crud/create_order.rs
View File

@ -66,7 +66,7 @@ pub async fn test_create_order(db: &DbConn) {
bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)), bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)),
customer_id: Set(Some(customer_insert_res.last_insert_id as i32)), customer_id: Set(Some(customer_insert_res.last_insert_id as i32)),
total: Set(dec!(15.10)), total: Set(dec!(15.10)),
placed_at: Set(Some(Utc::now().naive_utc())), placed_at: Set(Utc::now().naive_utc()),
..Default::default() ..Default::default()
}; };
let order_insert_res: InsertResult = Order::insert(order_1) let order_insert_res: InsertResult = Order::insert(order_1)