fix: Option decoding in any driver (launchbadge#3172)

jayy-lmao · Jun 6, 2024 · 4ec9f48 · 4ec9f48
1 parent 0b62ac1
commit 4ec9f48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/sqlx-core/src/any/type_info.rs b/sqlx-core/src/any/type_info.rs
@@ -31,7 +31,7 @@ pub enum AnyTypeInfoKind {
 
 impl TypeInfo for AnyTypeInfo {
     fn is_null(&self) -> bool {
-        false
+        self.kind == Null
     }
 
     fn name(&self) -> &str {

diff --git a/sqlx-core/src/any/value.rs b/sqlx-core/src/any/value.rs
@@ -92,7 +92,7 @@ impl Value for AnyValue {
     }
 
     fn is_null(&self) -> bool {
-        false
+        matches!(self.kind, AnyValueKind::Null)
     }
 }
 
@@ -120,6 +120,6 @@ impl<'a> ValueRef<'a> for AnyValueRef<'a> {
     }
 
     fn is_null(&self) -> bool {
-        false
+        matches!(self.kind, AnyValueKind::Null)
     }
 }
diff --git a/sqlx-core/src/types/mod.rs b/sqlx-core/src/types/mod.rs
@@ -18,7 +18,7 @@
 //! An `Option<T>` represents a potentially `NULL` value from SQL.
 //!
 
-use crate::database::Database;
+use crate::{database::Database, type_info::TypeInfo};
 
 #[cfg(feature = "bstr")]
 #[cfg_attr(docsrs, doc(cfg(feature = "bstr")))]
@@ -234,6 +234,6 @@ impl<T: Type<DB>, DB: Database> Type<DB> for Option<T> {
     }
 
     fn compatible(ty: &DB::TypeInfo) -> bool {
-        <T as Type<DB>>::compatible(ty)
+        ty.is_null() || <T as Type<DB>>::compatible(ty)
     }
 }