Fix build error

SeaQL · Jul 7, 2021 · b0c9eee · b0c9eee
1 parent 2ab5823
commit b0c9eee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/driver/sqlx_sqlite.rs b/src/driver/sqlx_sqlite.rs
@@ -24,8 +24,7 @@ macro_rules! bind_params_sqlx_sqlite {
                     } else if value.is_date_time() {
                         query.bind(value.as_ref_date_time())
                     } else if value.is_decimal() {
-                        use sea_query::rust_decimal::ToPrimitive;
-                        query.bind(value.as_ref_decimal().to_f64().unwrap())
+                        query.bind(value.decimal_to_f64())
                     } else if value.is_uuid() {
                         query.bind(value.as_ref_uuid())
                     } else {

diff --git a/src/value.rs b/src/value.rs
@@ -10,11 +10,7 @@ use std::str::from_utf8;
 use chrono::NaiveDateTime;
 
 #[cfg(feature = "with-rust_decimal")]
-use ::rust_decimal::Decimal;
-#[cfg(feature = "with-rust_decimal")]
-pub mod rust_decimal {
-    pub use rust_decimal::prelude::ToPrimitive;
-}
+use rust_decimal::Decimal;
 
 #[cfg(feature = "with-uuid")]
 use uuid::Uuid;
@@ -291,10 +287,19 @@ impl Value {
             _ => panic!("not Value::Decimal"),
         }
     }
+    #[cfg(feature = "with-rust_decimal")]
+    pub fn decimal_to_f64(&self) -> f64 {
+        use rust_decimal::prelude::ToPrimitive;
+        self.as_ref_decimal().to_f64().unwrap()
+    }
     #[cfg(not(feature = "with-rust_decimal"))]
     pub fn as_ref_decimal(&self) -> &bool {
         panic!("not Value::Decimal")
     }
+    #[cfg(not(feature = "with-rust_decimal"))]
+    pub fn decimal_to_f64(&self) -> f64 {
+        0.0
+    }
 }
 
 impl Value {
@@ -454,7 +459,7 @@ pub fn sea_value_to_json_value(v: &Value) -> Json {
         Value::DateTime(v) => v.format("%Y-%m-%d %H:%M:%S").to_string().into(),
         #[cfg(feature = "with-rust_decimal")]
         Value::Decimal(v) => {
-            use self::rust_decimal::ToPrimitive;
+            use rust_decimal::prelude::ToPrimitive;
             v.as_ref().to_f64().unwrap().into()
         },
         #[cfg(feature = "with-uuid")]