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

Support path expressions after Record IDs with integer IDs

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-10-30 01:30:21 +00:00
parent 12b6e04539
commit af9bd5b62f
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/src/sql/ending.rs
View file

@ -21,6 +21,7 @@ pub fn number(i: &str) -> IResult<&str, ()> {
map(char('"'), |_| ()),
map(char('\''), |_| ()),
map(char(';'), |_| ()),
map(char('.'), |_| ()),
map(char(','), |_| ()),
map(tag(".."), |_| ()),
map(eof, |_| ()),

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

@ -105,7 +105,13 @@ impl From<f64> for Number {
impl From<&str> for Number {
fn from(s: &str) -> Self {
Self::Decimal(BigDecimal::from_str(s).unwrap_or_default())
// Attempt to parse as i64
match s.parse::<i64>() {
// Store it as an i64
Ok(v) => Self::Int(v),
// It wasn't parsed as a i64 so store as a decimal
_ => Self::Decimal(BigDecimal::from_str(s).unwrap_or_default()),
}
}
}
@ -607,7 +613,7 @@ impl Sort for Vec<Number> {
}
pub fn number(i: &str) -> IResult<&str, Number> {
alt((map(integer, Number::from), map(decimal, Number::from)))(i)
alt((map(decimal, Number::from), map(integer, Number::from)))(i)
}
pub fn integer(i: &str) -> IResult<&str, i64> {