fix: restore original type-checking order

Author: abonander

sqlx-core/src/type_checking.rs

@@ -189,6 +189,22 @@ macro_rules! impl_type_checking {
             ) -> Result<&'static str, $crate::type_checking::Error> {
                 use $crate::config::macros::{DateTimeCrate, NumericCrate};
                 use $crate::type_checking::Error;
+                
+                // Check non-special types
+                // ---------------------
+                $(
+                    $(#[$meta])?
+                    if <$ty as sqlx_core::types::Type<$database>>::type_info() == *info {
+                        return Ok($crate::select_input_type!($ty $(, $input)?));
+                    }
+                )*
+
+                $(
+                    $(#[$meta])?
+                    if <$ty as sqlx_core::types::Type<$database>>::compatible(info) {
+                        return Ok($crate::select_input_type!($ty $(, $input)?));
+                    }
+                )*
 
                 // Check `macros.preferred-crates.date-time`
                 //
@@ -304,32 +320,32 @@ macro_rules! impl_type_checking {
                     return Err(Error::NumericCrateFeatureNotEnabled);
                 }
 
-                // Check all other types
+                Err(Error::NoMappingFound)
+            }
+
+            fn return_type_for_id(
+                info: &Self::TypeInfo,
+                preferred_crates: &$crate::config::macros::PreferredCrates,
+            ) -> Result<&'static str, $crate::type_checking::Error> {
+                use $crate::config::macros::{DateTimeCrate, NumericCrate};
+                use $crate::type_checking::Error;
+
+                // Check non-special types
                 // ---------------------
                 $(
                     $(#[$meta])?
                     if <$ty as sqlx_core::types::Type<$database>>::type_info() == *info {
-                        return Ok($crate::select_input_type!($ty $(, $input)?));
+                        return Ok(stringify!($ty));
                     }
                 )*
 
                 $(
                     $(#[$meta])?
                     if <$ty as sqlx_core::types::Type<$database>>::compatible(info) {
-                        return Ok($crate::select_input_type!($ty $(, $input)?));
+                        return Ok(stringify!($ty));
                     }
                 )*
-
-                Err(Error::NoMappingFound)
-            }
-
-            fn return_type_for_id(
-                info: &Self::TypeInfo,
-                preferred_crates: &$crate::config::macros::PreferredCrates,
-            ) -> Result<&'static str, $crate::type_checking::Error> {
-                use $crate::config::macros::{DateTimeCrate, NumericCrate};
-                use $crate::type_checking::Error;
-
+                
                 // Check `macros.preferred-crates.date-time`
                 //
                 // Due to legacy reasons, `time` takes precedent over `chrono` if both are enabled.
@@ -444,22 +460,6 @@ macro_rules! impl_type_checking {
                     return Err(Error::NumericCrateFeatureNotEnabled);
                 }
 
-                // Check all other types
-                // ---------------------
-                $(
-                    $(#[$meta])?
-                    if <$ty as sqlx_core::types::Type<$database>>::type_info() == *info {
-                        return Ok(stringify!($ty));
-                    }
-                )*
-
-                $(
-                    $(#[$meta])?
-                    if <$ty as sqlx_core::types::Type<$database>>::compatible(info) {
-                        return Ok(stringify!($ty));
-                    }
-                )*
-
                 Err(Error::NoMappingFound)
             }