From 1a9704eaad30b55d2a480f1c6a5159ab7841a232 Mon Sep 17 00:00:00 2001
From: Ari Seyhun <ariseyhun@live.com.au>
Date: Tue, 12 Oct 2021 18:27:45 +0700
Subject: [PATCH] Add support for `Option<Option<T>>` into active model

---
 src/entity/active_model.rs | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/entity/active_model.rs b/src/entity/active_model.rs
index 9ac92387..7e61b6f7 100644
--- a/src/entity/active_model.rs
+++ b/src/entity/active_model.rs
@@ -187,6 +187,24 @@ macro_rules! impl_into_active_value {
                 $fn(self)
             }
         }
+
+        impl IntoActiveValue<Option<$ty>> for Option<$ty> {
+            fn into_active_value(self) -> ActiveValue<Option<$ty>> {
+                match self {
+                    Some(value) => Set(Some(value)),
+                    None => Unset(None),
+                }
+            }
+        }
+
+        impl IntoActiveValue<Option<$ty>> for Option<Option<$ty>> {
+            fn into_active_value(self) -> ActiveValue<Option<$ty>> {
+                match self {
+                    Some(value) => Set(value),
+                    None => Unset(None),
+                }
+            }
+        }
     };
 }
 
@@ -201,7 +219,6 @@ impl_into_active_value!(u32, Set);
 impl_into_active_value!(u64, Set);
 impl_into_active_value!(f32, Set);
 impl_into_active_value!(f64, Set);
-impl_into_active_value!(&'static [u8], Set);
 impl_into_active_value!(&'static str, Set);
 impl_into_active_value!(String, Set);
 
@@ -233,18 +250,6 @@ impl_into_active_value!(crate::prelude::Decimal, Set);
 #[cfg_attr(docsrs, doc(cfg(feature = "with-uuid")))]
 impl_into_active_value!(crate::prelude::Uuid, Set);
 
-impl<V> IntoActiveValue<Option<V>> for Option<V>
-where
-    V: Into<Value> + Nullable,
-{
-    fn into_active_value(self) -> ActiveValue<Option<V>> {
-        match self {
-            Some(value) => Set(Some(value)),
-            None => Unset(None),
-        }
-    }
-}
-
 impl<V> ActiveValue<V>
 where
     V: Into<Value>,