Update sqlx-core/src/any/row.rs

Co-authored-by: Yota Toyama <raviqqe@gmail.com>
launchbadge · Jul 14, 2022 · 49bad74 · 49bad74
1 parent 1a2cc7b
commit 49bad74
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/sqlx-core/src/any/row.rs b/sqlx-core/src/any/row.rs
@@ -79,19 +79,14 @@ impl Row for AnyRow {
         T: Decode<'r, Self::Database> + Type<Self::Database>,
     {
         let value = self.try_get_raw(&index)?;
+        let ty = value.type_info();
 
-        if !value.is_null() {
-            let ty = value.type_info();
-
-            if !ty.is_null() && !T::compatible(&ty) {
-                return Err(Error::ColumnDecode {
-                    index: format!("{:?}", index),
-                    source: mismatched_types::<T>(&ty),
-                });
-            }
+        if !value.is_null() && !ty.is_null() && !T::compatible(&ty) {
+            Err(mismatched_types::<T>(&ty))
+        } else {
+            T::decode(value)
         }
-
-        T::decode(value).map_err(|source| Error::ColumnDecode {
+        .map_err(|source| Error::ColumnDecode {
             index: format!("{:?}", index),
             source,
         })