Merge pull request #24 from wslongchen/develop

Develop

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "akita"
-version = "0.3.6"
+version = "0.3.7"
 authors = ["mrpan <[email protected]>"]
 edition = "2018"
 description = "Akita - Mini orm for rust."

README.md

@@ -1,6 +1,6 @@
 # Akita   [![Build Status]][actions] [![Latest Version]][crates.io] [![akita: rustc 1.13+]][Rust 1.13] [![akita_derive: rustc 1.31+]][Rust 1.31]
 
-[Build Status]: https://img.shields.io/docsrs/akita/0.3.6?style=plastic
+[Build Status]: https://img.shields.io/docsrs/akita/0.3.7?style=plastic
 [actions]: https://github.com/wslongchen/akita/actions?query=branch%3Amaster
 [Latest Version]: https://img.shields.io/crates/v/akita?style=plastic
 [crates.io]: https://crates.io/crates/akita

akita_core/src/param.rs

@@ -18,9 +18,15 @@ impl From<Vec<Value>> for Params {
     }
 }
 
+
 impl <T: ToValue> From<T> for Params {
     fn from(x: T) -> Params {
-        Params::Vector(vec![x.to_value()])
+        let v = x.to_value();
+        match v {
+            Value::Nil => Params::Nil,
+            _ => Params::Vector(vec![v.to_owned()]),
+        }
+
     }
 }
 
@@ -48,13 +54,21 @@ where
 
 impl From<Value> for Params {
     fn from(x: Value) -> Params {
-        Params::Vector(vec![x])
+        match x {
+            Value::Nil => Params::Nil,
+            _ => Params::Vector(vec![x]),
+        }
     }
 }
 
 impl <'a> From<&'a dyn ToValue> for Params {
     fn from(x: &'a dyn ToValue) -> Params {
-        Params::Vector(vec![x.to_value().to_owned()])
+
+        let v = x.to_value();
+        match v {
+            Value::Nil => Params::Nil,
+            _ => Params::Vector(vec![v.to_owned()]),
+        }
     }
 }
 

src/manager.rs

@@ -215,6 +215,15 @@ impl AkitaManager {
         Ok(rows)
     }
 
+    pub fn execute_drop<S: Into<String>, P: Into<Params>>(
+        &mut self,
+        sql: S,
+        params: P,
+    ) -> Result<(), AkitaError> {
+        let rows = self.0.execute_drop(&sql.into(), params.into())?;
+        Ok(())
+    }
+
     pub fn execute_iter<S: Into<String>, P: Into<Params>>(
         &mut self,
         sql: S,
@@ -922,8 +931,7 @@ impl AkitaMapper for AkitaEntityManager{
     ) -> Result<(), AkitaError>
     {
         let sql: String = sql.into();
-        let _result: Result<Vec<()>, AkitaError> = self.execute_result(&sql, params);
-        Ok(())
+        self.0.execute_drop(&sql, params.into())
     }
 
     fn execute_result_opt<'a, R, S: Into<String>, P: Into<Params>>(

tests/akita.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use akita::*;
 use chrono::NaiveDateTime;
 
-#[derive(AkitaTable, Clone, Default, ToValue, FromValue)]
+#[derive(AkitaTable, Clone, Default)]
 #[table(name = "t_system_user")]
 pub struct User {
     #[table_id(name = "id")]
@@ -20,7 +20,7 @@ pub struct User {
     pub birthday: Option<NaiveDate>,
     /// 性别
     pub gender: u8,
-    #[field(exist = "false")]
+    #[field(exist = false)]
     pub is_org: bool,
     #[field(name = "token")]
     pub url_token: String,