holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accomodate decimals when converting gjson numbers (#3544)

Browse Source
This commit is contained in:
Darren Schroeder 2021-06-02 16:12:21 -05:00 committed by GitHub
parent 927578a26f
commit fd5da62c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu_plugin_query_json/src/query_json.rs
View File

@ -91,6 +91,7 @@ fn query_contains_modifiers(query: &str) -> bool {
fn convert_gjson_value_to_nu_value(v: &gjValue, tag: impl Into<Tag>) -> Value { fn convert_gjson_value_to_nu_value(v: &gjValue, tag: impl Into<Tag>) -> Value {
let tag = tag.into(); let tag = tag.into();
let span = tag.span;
match v.kind() { match v.kind() {
gjson::Kind::Array => { gjson::Kind::Array => {
@ -104,7 +105,14 @@ fn convert_gjson_value_to_nu_value(v: &gjValue, tag: impl Into<Tag>) -> Value {
} }
gjson::Kind::Null => UntaggedValue::nothing().into_value(&tag), gjson::Kind::Null => UntaggedValue::nothing().into_value(&tag),
gjson::Kind::False => UntaggedValue::boolean(false).into_value(&tag), gjson::Kind::False => UntaggedValue::boolean(false).into_value(&tag),
gjson::Kind::Number => UntaggedValue::int(v.i64()).into_value(&tag), gjson::Kind::Number => {
let str_value = v.str();
if str_value.contains('.') {
UntaggedValue::decimal_from_float(v.f64(), span).into_value(&tag)
} else {
UntaggedValue::int(v.i64()).into_value(&tag)
}
}
gjson::Kind::String => UntaggedValue::string(v.str()).into_value(&tag), gjson::Kind::String => UntaggedValue::string(v.str()).into_value(&tag),
gjson::Kind::True => UntaggedValue::boolean(true).into_value(&tag), gjson::Kind::True => UntaggedValue::boolean(true).into_value(&tag),
// I'm not sure how to test this, so it may not work // I'm not sure how to test this, so it may not work