Skip to content
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.

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

Fixes issue with overflow for Postgres #653

Merged
merged 2 commits into from
Mar 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 13 additions & 10 deletions src/postgres/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ pub(in crate::postgres) struct PostgresDecimal<D> {
}

impl Decimal {
pub(in crate::postgres) fn from_postgres<D: ExactSizeIterator<Item = u16>>(
pub(in crate::postgres) fn checked_from_postgres<D: ExactSizeIterator<Item = u16>>(
PostgresDecimal {
neg,
scale,
digits,
weight,
}: PostgresDecimal<D>,
) -> Self {
) -> Option<Self> {
let mut digits = digits.into_iter().collect::<Vec<_>>();

let fractionals_part_count = digits.len() as i32 + (-weight as i32) - 1;
Expand All @@ -54,23 +54,26 @@ impl Decimal {
};
let integers: Vec<_> = digits.drain(..last as usize).collect();
for digit in integers {
result *= Decimal::from_i128_with_scale(10i128.pow(4), 0);
result += Decimal::new(digit as i64, 0);
result = result.checked_mul(Decimal::from_i128_with_scale(10i128.pow(4), 0))?;
result = result.checked_add(Decimal::new(digit as i64, 0))?;
}
result *= Decimal::from_i128_with_scale(10i128.pow(4 * start_integers as u32), 0);
result = result.checked_mul(Decimal::from_i128_with_scale(10i128.pow(4 * start_integers as u32), 0))?;
}
// adding fractional part
if fractionals_part_count > 0 {
let start_fractionals = if weight < 0 { (-weight as u32) - 1 } else { 0 };
for (i, digit) in digits.into_iter().enumerate() {
let fract_pow = 4 * (i as u32 + 1 + start_fractionals);
let fract_pow = 4_u32.checked_mul(i as u32 + 1 + start_fractionals)?;
if fract_pow <= MAX_PRECISION_U32 {
result += Decimal::new(digit as i64, 0) / Decimal::from_i128_with_scale(10i128.pow(fract_pow), 0);
result = result.checked_add(
Decimal::new(digit as i64, 0) / Decimal::from_i128_with_scale(10i128.pow(fract_pow), 0),
)?;
} else if fract_pow == MAX_PRECISION_U32 + 4 {
// rounding last digit
if digit >= 5000 {
result +=
Decimal::new(1_i64, 0) / Decimal::from_i128_with_scale(10i128.pow(MAX_PRECISION_U32), 0);
result = result.checked_add(
Decimal::new(1_i64, 0) / Decimal::from_i128_with_scale(10i128.pow(MAX_PRECISION_U32), 0),
)?;
}
}
}
Expand All @@ -79,7 +82,7 @@ impl Decimal {
result.set_sign_negative(neg);
// Rescale to the postgres value, automatically rounding as needed.
result.rescale((scale as u32).min(MAX_PRECISION_U32));
result
Some(result)
}

pub(in crate::postgres) fn to_postgres(self) -> PostgresDecimal<Vec<i16>> {
Expand Down
7 changes: 5 additions & 2 deletions src/postgres/diesel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,15 @@ impl<'a> TryFrom<&'a PgNumeric> for Decimal {
PgNumeric::NaN => return Err(Box::from("NaN is not supported in Decimal")),
};

Ok(Self::from_postgres(PostgresDecimal {
let Some(result) = Self::checked_from_postgres(PostgresDecimal {
neg,
weight,
scale,
digits: digits.iter().copied().map(|v| v.try_into().unwrap()),
}))
}) else {
return Err(Box::new(crate::error::Error::ExceedsMaximumPossibleValue));
};
Ok(result)
}
}

Expand Down
26 changes: 24 additions & 2 deletions src/postgres/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ impl<'a> FromSql<'a> for Decimal {
groups.push(u16::from_be_bytes(read_two_bytes(&mut raw)?));
}

Ok(Self::from_postgres(PostgresDecimal {
let Some(result) = Self::checked_from_postgres(PostgresDecimal {
neg: sign == 0x4000,
weight,
scale,
digits: groups.into_iter(),
}))
}) else {
return Err(Box::new(crate::error::Error::ExceedsMaximumPossibleValue));
};
Ok(result)
}

fn accepts(ty: &Type) -> bool {
Expand Down Expand Up @@ -422,4 +425,23 @@ mod test {
}
}
}

#[test]
fn numeric_overflow_from_sql() {
let close_to_overflow = Decimal::from_sql(
&Type::NUMERIC,
&[0x00, 0x01, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01],
);
assert!(close_to_overflow.is_ok());
assert_eq!(close_to_overflow.unwrap().to_string(), "10000000000000000000000000000");
let overflow = Decimal::from_sql(
&Type::NUMERIC,
&[0x00, 0x01, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a],
);
assert!(overflow.is_err());
assert_eq!(
overflow.unwrap_err().to_string(),
crate::error::Error::ExceedsMaximumPossibleValue.to_string()
);
}
}
Loading