Merge branch 'v0.9.x' into dev

Author: gammelalf

Cargo.toml

@@ -11,7 +11,7 @@ members = [
 
 [package]
 name = "rorm"
-version = "0.9.4"
+version = "0.9.6"
 edition = "2021"
 repository = "https://github.com/rorm-orm/rorm"
 authors = ["gammelalf", "myOmikron <[email protected]>"]

changelog.txt

@@ -1,4 +1,4 @@
-Since 0.9.4
+Since 0.9.6
 -----------
 
 Notes for publishing

src/conditions/in.rs

@@ -32,12 +32,28 @@ where
     B: Condition<'a>,
 {
     fn build(&self, mut builder: ConditionBuilder<'_, 'a>) {
+        let bool_fallback;
+        let collection_operator;
+        let binary_operator;
+        match self.operator {
+            InOperator::In => {
+                bool_fallback = false;
+                collection_operator = CollectionOperator::Or;
+                binary_operator = BinaryOperator::Equals;
+            }
+            InOperator::NotIn => {
+                bool_fallback = true;
+                collection_operator = CollectionOperator::And;
+                binary_operator = BinaryOperator::NotEquals;
+            }
+        }
+
         if self.snd_arg.is_empty() {
-            Value::Bool(false).build(builder);
+            Value::Bool(bool_fallback).build(builder);
         } else {
-            builder.push_condition(FlatCondition::StartCollection(CollectionOperator::Or));
+            builder.push_condition(FlatCondition::StartCollection(collection_operator));
             for snd_arg in self.snd_arg.iter() {
-                builder.push_condition(FlatCondition::BinaryCondition(BinaryOperator::Equals));
+                builder.push_condition(FlatCondition::BinaryCondition(binary_operator));
                 self.fst_arg.build(builder.reborrow());
                 snd_arg.build(builder.reborrow());
             }

src/crud/update.rs

@@ -229,6 +229,20 @@ where
         ));
         self
     }
+
+    /// Add a column to update if `value` is `Some`
+    ///
+    /// Can be called multiple times.
+    pub fn set_if<I>(self, field: FieldProxy<I>, value: Option<<I::Field as Field>::Type>) -> Self
+    where
+        I: FieldProxyImpl<Field: SingleColumnField, Path = M>,
+    {
+        if let Some(value) = value {
+            self.set(field, value)
+        } else {
+            self
+        }
+    }
 }
 
 impl<'ex, 'rf, E, M> UpdateBuilder<'rf, E, M, columns::NonEmpty>