Skip to content

fix(macros): only report Ambiguous{DateTime,Numeric}Type when preferred crate is Inferred #4463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abonander merged 1 commit into from
Oct 15, 2026
+74 −8
Merged

fix(macros): only report Ambiguous{DateTime,Numeric}Type when preferred crate is Inferred #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions sqlx-core/src/type_checking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ macro_rules! impl_type_checking {
if matches!(preferred_crates.date_time, DateTimeCrate::Time | DateTimeCrate::Inferred) {
$(
if <$time_ty as sqlx_core::types::Type<$database>>::type_info() == *info {
if cfg!(feature = "chrono") {
if preferred_crates.date_time == DateTimeCrate::Inferred && cfg!(feature = "chrono") {
return Err($crate::type_checking::Error::AmbiguousDateTimeType {
fallback: $crate::select_input_type!($time_ty $(, $time_input)?),
});
Expand All @@ -227,7 +227,7 @@ macro_rules! impl_type_checking {

$(
if <$time_ty as sqlx_core::types::Type<$database>>::compatible(info) {
if cfg!(feature = "chrono") {
if preferred_crates.date_time == DateTimeCrate::Inferred && cfg!(feature = "chrono") {
return Err($crate::type_checking::Error::AmbiguousDateTimeType {
fallback: $crate::select_input_type!($time_ty $(, $time_input)?),
});
Expand Down Expand Up @@ -272,7 +272,7 @@ macro_rules! impl_type_checking {
if matches!(preferred_crates.numeric, NumericCrate::BigDecimal | NumericCrate::Inferred) {
$(
if <$bigdecimal_ty as sqlx_core::types::Type<$database>>::type_info() == *info {
if cfg!(feature = "rust_decimal") {
if preferred_crates.numeric == NumericCrate::Inferred && cfg!(feature = "rust_decimal") {
return Err($crate::type_checking::Error::AmbiguousNumericType {
fallback: $crate::select_input_type!($bigdecimal_ty $(, $bigdecimal_input)?),
});
Expand All @@ -284,7 +284,7 @@ macro_rules! impl_type_checking {

$(
if <$bigdecimal_ty as sqlx_core::types::Type<$database>>::compatible(info) {
if cfg!(feature = "rust_decimal") {
if preferred_crates.numeric == NumericCrate::Inferred && cfg!(feature = "rust_decimal") {
return Err($crate::type_checking::Error::AmbiguousNumericType {
fallback: $crate::select_input_type!($bigdecimal_ty $(, $bigdecimal_input)?),
});
Expand Down Expand Up @@ -355,7 +355,7 @@ macro_rules! impl_type_checking {
if matches!(preferred_crates.date_time, DateTimeCrate::Time | DateTimeCrate::Inferred) {
$(
if <$time_ty as sqlx_core::types::Type<$database>>::type_info() == *info {
if cfg!(feature = "chrono") {
if preferred_crates.date_time == DateTimeCrate::Inferred && cfg!(feature = "chrono") {
return Err($crate::type_checking::Error::AmbiguousDateTimeType {
fallback: stringify!($time_ty),
});
Expand All @@ -367,7 +367,7 @@ macro_rules! impl_type_checking {

$(
if <$time_ty as sqlx_core::types::Type<$database>>::compatible(info) {
if cfg!(feature = "chrono") {
if preferred_crates.date_time == DateTimeCrate::Inferred && cfg!(feature = "chrono") {
return Err($crate::type_checking::Error::AmbiguousDateTimeType {
fallback: stringify!($time_ty),
});
Expand Down Expand Up @@ -412,7 +412,7 @@ macro_rules! impl_type_checking {
if matches!(preferred_crates.numeric, NumericCrate::BigDecimal | NumericCrate::Inferred) {
$(
if <$bigdecimal_ty as sqlx_core::types::Type<$database>>::type_info() == *info {
if cfg!(feature = "rust_decimal") {
if preferred_crates.numeric == NumericCrate::Inferred && cfg!(feature = "rust_decimal") {
return Err($crate::type_checking::Error::AmbiguousNumericType {
fallback: stringify!($bigdecimal_ty),
});
Expand All @@ -424,7 +424,7 @@ macro_rules! impl_type_checking {

$(
if <$bigdecimal_ty as sqlx_core::types::Type<$database>>::compatible(info) {
if cfg!(feature = "rust_decimal") {
if preferred_crates.numeric == NumericCrate::Inferred && cfg!(feature = "rust_decimal") {
return Err($crate::type_checking::Error::AmbiguousNumericType {
fallback: stringify!($bigdecimal_ty),
});
Expand Down
66 changes: 66 additions & 0 deletions sqlx-postgres/src/type_checking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,69 @@ impl_type_checking!(
},
},
);

#[cfg(all(
test,
feature = "time",
feature = "chrono",
feature = "bigdecimal",
feature = "rust_decimal"
))]
mod tests {
use super::*;
use crate::PgTypeInfo;
use sqlx_core::config::macros::{DateTimeCrate, NumericCrate, PreferredCrates};
use sqlx_core::type_checking::{Error, TypeChecking};

#[test]
fn test_preferred_crates_date_time() {
let timestamptz = PgTypeInfo::TIMESTAMPTZ;

// Inferred with both features enabled should return AmbiguousDateTimeType
let mut prefs = PreferredCrates::default();
assert!(matches!(
Postgres::param_type_for_id(&timestamptz, &prefs),
Err(Error::AmbiguousDateTimeType { .. })
));
assert!(matches!(
Postgres::return_type_for_id(&timestamptz, &prefs),
Err(Error::AmbiguousDateTimeType { .. })
));

// Explicit Time should succeed even with chrono enabled
prefs.date_time = DateTimeCrate::Time;
assert!(Postgres::param_type_for_id(&timestamptz, &prefs).is_ok());
assert!(Postgres::return_type_for_id(&timestamptz, &prefs).is_ok());

// Explicit Chrono should succeed even with time enabled
prefs.date_time = DateTimeCrate::Chrono;
assert!(Postgres::param_type_for_id(&timestamptz, &prefs).is_ok());
assert!(Postgres::return_type_for_id(&timestamptz, &prefs).is_ok());
}

#[test]
fn test_preferred_crates_numeric() {
let numeric = PgTypeInfo::NUMERIC;

// Inferred with both features enabled should return AmbiguousNumericType
let mut prefs = PreferredCrates::default();
assert!(matches!(
Postgres::param_type_for_id(&numeric, &prefs),
Err(Error::AmbiguousNumericType { .. })
));
assert!(matches!(
Postgres::return_type_for_id(&numeric, &prefs),
Err(Error::AmbiguousNumericType { .. })
));

// Explicit BigDecimal should succeed even with rust_decimal enabled
prefs.numeric = NumericCrate::BigDecimal;
assert!(Postgres::param_type_for_id(&numeric, &prefs).is_ok());
assert!(Postgres::return_type_for_id(&numeric, &prefs).is_ok());

// Explicit RustDecimal should succeed even with bigdecimal enabled
prefs.numeric = NumericCrate::RustDecimal;
assert!(Postgres::param_type_for_id(&numeric, &prefs).is_ok());
assert!(Postgres::return_type_for_id(&numeric, &prefs).is_ok());
}
}
Loading