Commit6e61e96

committed

by_map method skip null value

1 parent37fe434 commit6e61e96Copy full SHA for 6e61e96

File tree

+28

-3

lines changed

+28

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ macro_rules! impl_select {`
`185`	`185`	` where `
`186`	`186`	`trim ' and ': for key,item in condition:`
`187`	`187`	`if item == null:`
`188`		`- continue;`
	`188`	`+ continue:`
`189`	`189`	`if !item.is_array():`
`190`	`190`	` and ${key.operator_sql()}#{item}`
`191`	`191`	`if item.is_array():`
`@@ -280,7 +280,7 @@ macro_rules! impl_update {`
`280`	`280`	` where `
`281`	`281`	`trim ' and ': for key,item in condition:`
`282`	`282`	`if item == null:`
`283`		`- continue;`
	`283`	`+ continue:`
`284`	`284`	`if !item.is_array():`
`285`	`285`	` and ${key.operator_sql()}#{item}`
`286`	`286`	`if item.is_array():`
`@@ -383,7 +383,7 @@ macro_rules! impl_delete {`
`383`	`383`	` where `
`384`	`384`	`trim ' and ': for key,item in condition:`
`385`	`385`	`if item == null:`
`386`		`- continue;`
	`386`	`+ continue:`
`387`	`387`	`if !item.is_array():`
`388`	`388`	` and ${key.operator_sql()}#{item}`
`389`	`389`	`if item.is_array():`

Lines changed: 25 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,31 @@ mod test {`
`1032`	`1032`	`block_on(f);`
`1033`	`1033`	`}`
`1034`	`1034`
	`1035`	`+#[test]`
	`1036`	`+fntest_select_by_map_null_value(){`
	`1037`	`+let f =asyncmove{`
	`1038`	`+letmut rb =RBatis::new();`
	`1039`	`+let queue =Arc::new(SyncVec::new());`
	`1040`	`+ rb.set_intercepts(vec![Arc::new(MockIntercept::new(queue.clone()))]);`
	`1041`	`+ rb.init(MockDriver{},"test").unwrap();`
	`1042`	`+`
	`1043`	`+let ids:Vec<String> =vec![];`
	`1044`	`+let r =MockTable::select_by_map(`
	`1045`	`+&mut rb,`
	`1046`	`+value!{`
	`1047`	`+"id":"1",`
	`1048`	`+"name":Option::<String>::None,`
	`1049`	`+},`
	`1050`	`+)`
	`1051`	`+.await`
	`1052`	`+.unwrap();`
	`1053`	`+let(sql, args) = queue.pop().unwrap();`
	`1054`	`+assert_eq!(sql,"select * from mock_table where id = ?");`
	`1055`	`+assert_eq!(args, vec![value!("1")]);`
	`1056`	`+};`
	`1057`	`+block_on(f);`
	`1058`	`+}`
	`1059`	`+`
`1035`	`1060`	impl_select!(MockTable{select_from_table_name_by_id(id:&str,table_name:&str) =>"`where id = #{id}`"});
`1036`	`1061`
`1037`	`1062`	`#[test]`

Comments

(0)