From a838cf7c23e9a2262537802a113ae35bc483725b Mon Sep 17 00:00:00 2001 From: Sam Samai Date: Mon, 12 Jul 2021 00:17:28 +1000 Subject: [PATCH] Naivedatetime for placed_at on order (#40) * WIP use NativeDateTime for placed_at * Use NaiveDatetime for placed_at * Cargo fmt again Co-authored-by: Chris Tsang --- src/executor/query.rs | 2 ++ tests/bakery_chain/order.rs | 3 ++- tests/crud/create_lineitem.rs | 3 ++- tests/crud/create_order.rs | 3 ++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/executor/query.rs b/src/executor/query.rs index 15b87b4c..75a73463 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -1,4 +1,5 @@ use crate::DbErr; +use chrono::NaiveDateTime; use std::fmt; #[derive(Debug)] @@ -163,6 +164,7 @@ try_getable_mysql!(u64); try_getable_all!(f32); try_getable_all!(f64); try_getable_all!(String); +try_getable_all!(NaiveDateTime); #[cfg(feature = "with-rust_decimal")] use rust_decimal::Decimal; diff --git a/tests/bakery_chain/order.rs b/tests/bakery_chain/order.rs index de38df60..ce6418a2 100644 --- a/tests/bakery_chain/order.rs +++ b/tests/bakery_chain/order.rs @@ -1,3 +1,4 @@ +use chrono::NaiveDateTime; use rust_decimal::prelude::*; use sea_orm::entity::prelude::*; @@ -16,7 +17,7 @@ pub struct Model { pub total: Decimal, pub bakery_id: Option, pub customer_id: Option, - pub placed_at: String, + pub placed_at: Option, } #[derive(Copy, Clone, Debug, EnumIter, DeriveColumn)] diff --git a/tests/crud/create_lineitem.rs b/tests/crud/create_lineitem.rs index ac7af1ca..d081dc5a 100644 --- a/tests/crud/create_lineitem.rs +++ b/tests/crud/create_lineitem.rs @@ -1,4 +1,5 @@ pub use super::*; +use chrono::offset::Utc; use rust_decimal_macros::dec; pub async fn test_create_lineitem(db: &DbConn) { @@ -64,7 +65,7 @@ pub async fn test_create_lineitem(db: &DbConn) { let order_1 = order::ActiveModel { bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)), customer_id: Set(Some(customer_insert_res.last_insert_id as i32)), - placed_at: Set("placeholder".to_string()), + placed_at: Set(Some(Utc::now().naive_utc())), ..Default::default() }; let order_insert_res: InsertResult = Order::insert(order_1) diff --git a/tests/crud/create_order.rs b/tests/crud/create_order.rs index d3769203..0d2f1903 100644 --- a/tests/crud/create_order.rs +++ b/tests/crud/create_order.rs @@ -1,4 +1,5 @@ pub use super::*; +use chrono::offset::Utc; use rust_decimal_macros::dec; pub async fn test_create_order(db: &DbConn) { @@ -65,7 +66,7 @@ pub async fn test_create_order(db: &DbConn) { bakery_id: Set(Some(bakery_insert_res.last_insert_id as i32)), customer_id: Set(Some(customer_insert_res.last_insert_id as i32)), total: Set(dec!(15.10)), - placed_at: Set("placeholder".to_string()), + placed_at: Set(Some(Utc::now().naive_utc())), ..Default::default() }; let order_insert_res: InsertResult = Order::insert(order_1)