itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-12-25 09:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Issue #2549 - cannot use feature "rust_decimal" without also using "bigdecimal" (#2585)

Browse Source 
* Fix missing num-bigint dependency for rust_decimal

* Fix missing feature name change from "decimal" to "rust_decimal"

* update missing "decimal"->"rust_decimal" renaming in range.rs

* Update money.rs references to "decimal"

* Update "decimal" -> "rust_decimal"
This commit is contained in:
Jack DeNeut 2023-07-07 01:02:47 +02:00 committed by GitHub
parent 016884454b
commit 258eacafd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sqlx-macros-core/src/database/postgres.rs
View File

@ -59,7 +59,7 @@ impl_database_ext! {
#[cfg(feature = "bigdecimal")]
sqlx::types::BigDecimal,
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
sqlx::types::Decimal,
#[cfg(feature = "ipnetwork")]
@ -118,7 +118,7 @@ impl_database_ext! {
#[cfg(feature = "bigdecimal")]
Vec<sqlx::types::BigDecimal> | &[sqlx::types::BigDecimal],
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
Vec<sqlx::types::Decimal> | &[sqlx::types::Decimal],
#[cfg(feature = "ipnetwork")]
@ -138,7 +138,7 @@ impl_database_ext! {
#[cfg(feature = "bigdecimal")]
sqlx::postgres::types::PgRange<sqlx::types::BigDecimal>,
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
sqlx::postgres::types::PgRange<sqlx::types::Decimal>,
#[cfg(feature = "chrono")]

2
sqlx-postgres/Cargo.toml
View File

@ -16,7 +16,7 @@ migrate = ["sqlx-core/migrate"]
offline = ["sqlx-core/offline"]
# Type integration features which require additional dependencies
rust_decimal = ["dep:rust_decimal"]
rust_decimal = ["dep:rust_decimal", "dep:num-bigint"]
bigdecimal = ["dep:bigdecimal", "dep:num-bigint"]
[dependencies]

2
sqlx-postgres/src/types/mod.rs
View File

@ -196,7 +196,7 @@ mod time_tz;
#[cfg(feature = "bigdecimal")]
mod bigdecimal;
#[cfg(any(feature = "bigdecimal", feature = "decimal"))]
#[cfg(any(feature = "bigdecimal", feature = "rust_decimal"))]
mod numeric;
#[cfg(feature = "rust_decimal")]

8
sqlx-postgres/src/types/money.rs
View File

@ -81,7 +81,7 @@ impl PgMoney {
/// See the type-level docs for an explanation of `locale_frac_digits`.
///
/// [`Decimal`]: crate::types::Decimal
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
pub fn to_decimal(self, locale_frac_digits: u32) -> rust_decimal::Decimal {
rust_decimal::Decimal::new(self.0, locale_frac_digits)
}
@ -94,7 +94,7 @@ impl PgMoney {
/// If the value is larger than 63 bits it will be truncated.
///
/// [`Decimal`]: crate::types::Decimal
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
pub fn from_decimal(mut decimal: rust_decimal::Decimal, locale_frac_digits: u32) -> Self {
// this is all we need to convert to our expected locale's `frac_digits`
decimal.rescale(locale_frac_digits);
@ -316,7 +316,7 @@ mod tests {
}
#[test]
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
fn conversion_to_decimal_works() {
assert_eq!(
rust_decimal::Decimal::new(12345, 2),
@ -325,7 +325,7 @@ mod tests {
}
#[test]
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
fn conversion_from_decimal_works() {
assert_eq!(
PgMoney(12345),

2
sqlx-postgres/src/types/range.rs
View File

@ -143,7 +143,7 @@ impl Type<Postgres> for PgRange<bigdecimal::BigDecimal> {
}
}
#[cfg(feature = "decimal")]
#[cfg(feature = "rust_decimal")]
impl Type<Postgres> for PgRange<rust_decimal::Decimal> {
fn type_info() -> PgTypeInfo {
PgTypeInfo::NUM_RANGE