rbatis
diff --git a/‎Cargo.toml
Copy file name to clipboardExpand all lines: Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion b/‎Cargo.toml
Copy file name to clipboardExpand all lines: Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎example/src/crud_select.rs
Copy file name to clipboardExpand all lines: example/src/crud_select.rs
+7-31Lines changed: 7 additions & 31 deletions b/‎example/src/crud_select.rs
Copy file name to clipboardExpand all lines: example/src/crud_select.rs
+7-31Lines changed: 7 additions & 31 deletions
diff --git a/‎src/crud.rs
Copy file name to clipboardExpand all lines: src/crud.rs
+8-4Lines changed: 8 additions & 4 deletions b/‎src/crud.rs
Copy file name to clipboardExpand all lines: src/crud.rs
+8-4Lines changed: 8 additions & 4 deletions
@@ -8,7 +8,7 @@ members = [
 
 [package]
 name = "rbatis"
-version = "4.5.48"
+version = "4.5.49"
 description = "The Rust SQL Toolkit and ORM Library. An async, pure Rust SQL crate featuring compile-time Dynamic SQL"
 readme = "Readme.md"
 authors = ["ce <zhuxiujia@qq.com>"]
 
@@ -2,9 +2,10 @@ use log::LevelFilter;
 use rbatis::dark_std::defer;
 use rbatis::rbdc::datetime::DateTime;
 use rbatis::table_sync::SqliteTableMapper;
-use rbatis::RBatis;
+use rbatis::{crud, RBatis};
 use serde_json::json;
 use rbatis::impl_select;
+use rbatis::rbdc::db::ExecResult;
 
 /// table
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -22,7 +23,7 @@ pub struct Activity {
     pub version: Option<i64>,
     pub delete_flag: Option<i32>,
 }
-
+crud!(Activity{});
 impl_select!(Activity{select_id_name(id:&str,name:&str) => "`where id = #{id} and name = #{name}`"});
 
 #[tokio::main]
@@ -38,38 +39,13 @@ pub async fn main() {
 
     let rb = RBatis::new();
     // ------------choose database driver------------
-    // rb.init(rbdc_mysql::driver::MysqlDriver {}, "mysql://root:123456@localhost:3306/test").unwrap();
+     rb.init(rbdc_mysql::driver::MysqlDriver {}, "mysql://root:123456@localhost:3306/test").unwrap();
     // rb.init(rbdc_pg::driver::PgDriver {}, "postgres://postgres:123456@localhost:5432/postgres").unwrap();
     // rb.init(rbdc_mssql::driver::MssqlDriver {}, "mssql://jdbc:sqlserver://localhost:1433;User=SA;Password={TestPass!123456};Database=master;").unwrap();
-    rb.init(rbdc_sqlite::driver::SqliteDriver {}, "sqlite://target/sqlite.db").unwrap();
+    //rb.init(rbdc_sqlite::driver::SqliteDriver {}, "sqlite://target/sqlite.db").unwrap();
     // table sync done
-    sync_table(&rb).await;
-
-    let data = Activity::select_id_name(&rb, "1", "1").await;
+    let data = Activity::select_in_column::<i32>(&rb, "id", &[]).await;
     println!("select_id_name = {}", json!(data));
 }
 
-async fn sync_table(rb: &RBatis) {
-    fast_log::logger().set_level(LevelFilter::Off);
-    _ = RBatis::sync(
-        &rb.acquire().await.unwrap(),
-        &SqliteTableMapper {},
-        &Activity {
-            id: Some(String::new()),
-            name: Some(String::new()),
-            pc_link: Some(String::new()),
-            h5_link: Some(String::new()),
-            pc_banner_img: Some(String::new()),
-            h5_banner_img: Some(String::new()),
-            sort: Some(String::new()),
-            status: Some(0),
-            remark: Some(String::new()),
-            create_time: Some(DateTime::now()),
-            version: Some(0),
-            delete_flag: Some(0),
-        },
-        "activity",
-    )
-        .await;
-    fast_log::logger().set_level(LevelFilter::Debug);
-}
+
@@ -214,17 +214,20 @@ macro_rules! impl_select {
          "` where ${column} in (`
           trim ',': for _,item in column_values:
              #{item},
-          `)`"},$table_name);
+          `)`"},$table_name => { if column_values.is_empty() { return Ok(vec![]); }} );
     };
     ($table:ty{$fn_name:ident $(< $($gkey:ident:$gtype:path $(,)?)* >)? ($($param_key:ident:$param_type:ty $(,)?)*) => $sql:expr}$(,$table_name:expr)?) => {
         $crate::impl_select!($table{$fn_name$(<$($gkey:$gtype,)*>)?($($param_key:$param_type,)*) ->Vec => $sql}$(,$table_name)?);
     };
-    ($table:ty{$fn_name:ident $(< $($gkey:ident:$gtype:path $(,)?)* >)? ($($param_key:ident:$param_type:ty $(,)?)*) -> $container:tt => $sql:expr}$(,$table_name:expr)?) => {
+    ($table:ty{$fn_name:ident $(< $($gkey:ident:$gtype:path $(,)?)* >)? ($($param_key:ident:$param_type:ty $(,)?)*) -> $container:tt => $sql:expr}$(,$table_name:expr)?  $( => $cond:expr)? ) => {
         impl $table{
             pub async fn $fn_name $(<$($gkey:$gtype,)*>)? (executor: &dyn  $crate::executor::Executor,$($param_key:$param_type,)*) -> std::result::Result<$container<$table>,$crate::rbdc::Error>
             {
                      #[$crate::py_sql("`select ${table_column} from ${table_name} `",$sql)]
                      async fn $fn_name$(<$($gkey: $gtype,)*>)?(executor: &dyn $crate::executor::Executor,table_column:&str,table_name:&str,$($param_key:$param_type,)*) -> std::result::Result<$container<$table>,$crate::rbdc::Error> {impled!()}
+
+                     $($cond)?
+
                      let mut table_column = "*".to_string();
                      let mut table_name = String::new();
                      $(table_name = $table_name.to_string();)?
@@ -398,7 +401,7 @@ macro_rules! impl_delete {
         "`where ${column} in (`
           trim ',': for _,item in column_values:
              #{item},
-          `)`"},$table_name);
+          `)`"},$table_name => { if column_values.is_empty() { return Ok($crate::rbdc::db::ExecResult::default()); }} );
 
         impl $table {
             pub async fn delete_by_column_batch<V:serde::Serialize>(
@@ -419,7 +422,7 @@ macro_rules! impl_delete {
             }
         }
     };
-    ($table:ty{$fn_name:ident $(< $($gkey:ident:$gtype:path $(,)?)* >)? ($($param_key:ident:$param_type:ty$(,)?)*) => $sql_where:expr}$(,$table_name:expr)?) => {
+    ($table:ty{$fn_name:ident $(< $($gkey:ident:$gtype:path $(,)?)* >)? ($($param_key:ident:$param_type:ty$(,)?)*) => $sql_where:expr}$(,$table_name:expr)? $( => $cond:expr)?) => {
         impl $table {
             pub async fn $fn_name$(<$($gkey:$gtype,)*>)?(
                 executor: &dyn $crate::executor::Executor,
@@ -436,6 +439,7 @@ macro_rules! impl_delete {
                 ) -> std::result::Result<$crate::rbdc::db::ExecResult, $crate::rbdc::Error> {
                     impled!()
                 }
+                $($cond)?
                 let mut table_name = String::new();
                 $(table_name = $table_name.to_string();)?
                 #[$crate::snake_name($table)]