Merge pull request #223 from SeaQL/active-value-api

`ActiveValue::take()` & `ActiveValue::into_value()` without `unwrap()`
SeaQL · Oct 12, 2021 · edc2e65 · edc2e65
2 parents 664afa4 + 35b8eb9
commit edc2e65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs
@@ -209,23 +209,23 @@ where
         matches!(self.state, ActiveValueState::Unset)
     }
 
-    pub fn take(&mut self) -> V {
+    pub fn take(&mut self) -> Option<V> {
         self.state = ActiveValueState::Unset;
-        self.value.take().unwrap()
+        self.value.take()
     }
 
     pub fn unwrap(self) -> V {
         self.value.unwrap()
     }
 
-    pub fn into_value(self) -> Value {
-        self.value.unwrap().into()
+    pub fn into_value(self) -> Option<Value> {
+        self.value.map(Into::into)
     }
 
     pub fn into_wrapped_value(self) -> ActiveValue<Value> {
         match self.state {
-            ActiveValueState::Set => ActiveValue::set(self.into_value()),
-            ActiveValueState::Unchanged => ActiveValue::unchanged(self.into_value()),
+            ActiveValueState::Set => ActiveValue::set(self.into_value().unwrap()),
+            ActiveValueState::Unchanged => ActiveValue::unchanged(self.into_value().unwrap()),
             ActiveValueState::Unset => ActiveValue::unset(),
         }
     }

diff --git a/src/query/insert.rs b/src/query/insert.rs
@@ -120,7 +120,7 @@ where
             }
             if av_has_val {
                 columns.push(col);
-                values.push(av.into_value());
+                values.push(av.into_value().unwrap());
             }
         }
         self.query.columns(columns);