noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure database doesn’t panic when rounding decimal values with more than 16 decimal places

Browse source 
Closes #1378
This commit is contained in:
Tobie Morgan Hitchcock 2022-10-19 11:06:17 +01:00
parent 7f56fb9964
commit 227bb0a3ce
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/src/sql/number.rs
View file

@ -285,7 +285,14 @@ impl Number {
match self { match self {
Number::Int(v) => v.into(), Number::Int(v) => v.into(),
Number::Float(v) => v.ceil().into(), Number::Float(v) => v.ceil().into(),
Number::Decimal(v) => (v + BigDecimal::from_f32(0.5).unwrap()).round(0).into(), Number::Decimal(v) => {
if v.digits() > 16 {
let v = (v.to_f64().unwrap_or_default() + 0.5).round();
BigDecimal::from_f64(v).unwrap_or_default().into()
} else {
(v + BigDecimal::from_f32(0.5).unwrap()).round(0).into()
}
}
} }
} }
@ -293,7 +300,14 @@ impl Number {
match self { match self {
Number::Int(v) => v.into(), Number::Int(v) => v.into(),
Number::Float(v) => v.floor().into(), Number::Float(v) => v.floor().into(),
Number::Decimal(v) => (v - BigDecimal::from_f32(0.5).unwrap()).round(0).into(), Number::Decimal(v) => {
if v.digits() > 16 {
let v = (v.to_f64().unwrap_or_default() - 0.5).round();
BigDecimal::from_f64(v).unwrap_or_default().into()
} else {
(v - BigDecimal::from_f32(0.5).unwrap()).round(0).into()
}
}
} }
} }
@ -301,7 +315,14 @@ impl Number {
match self { match self {
Number::Int(v) => v.into(), Number::Int(v) => v.into(),
Number::Float(v) => v.round().into(), Number::Float(v) => v.round().into(),
Number::Decimal(v) => v.round(0).into(), Number::Decimal(v) => {
if v.digits() > 16 {
let v = v.to_f64().unwrap_or_default().round();
BigDecimal::from_f64(v).unwrap_or_default().into()
} else {
v.round(0).into()
}
}
} }
} }