Skip to content
Open
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
4 changes: 4 additions & 0 deletions src/json_get_bool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ fn jiter_json_get_bool(json_data: Option<&str>, path: &[JsonPath]) -> Result<boo
if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
match peek {
Peek::True | Peek::False => Ok(jiter.known_bool(peek)?),
Peek::String => {
let s = jiter.known_str()?;
s.parse::<bool>().map_err(|_| GetError)
}
_ => get_err!(),
}
} else {
Expand Down
5 changes: 4 additions & 1 deletion src/json_get_float.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,17 @@ impl InvokeResult for Float64Array {
fn jiter_json_get_float(json_data: Option<&str>, path: &[JsonPath]) -> Result<f64, GetError> {
if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
match peek {
Peek::String => {
let s = jiter.known_str()?;
s.parse::<f64>().map_err(|_| GetError)
}
// numbers are represented by everything else in peek, hence doing it this way
Peek::Null
| Peek::True
| Peek::False
| Peek::Minus
| Peek::Infinity
| Peek::NaN
| Peek::String
| Peek::Array
| Peek::Object => get_err!(),
_ => match jiter.known_number(peek)? {
Expand Down
6 changes: 4 additions & 2 deletions src/json_get_int.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,16 @@ impl InvokeResult for Int64Array {
fn jiter_json_get_int(json_data: Option<&str>, path: &[JsonPath]) -> Result<i64, GetError> {
if let Some((mut jiter, peek)) = jiter_json_find(json_data, path) {
match peek {
// numbers are represented by everything else in peek, hence doing it this way
Peek::String => {
let s = jiter.known_str()?;
s.parse::<i64>().map_err(|_| GetError)
}
Peek::Null
| Peek::True
| Peek::False
| Peek::Minus
| Peek::Infinity
| Peek::NaN
| Peek::String
| Peek::Array
| Peek::Object => get_err!(),
_ => match jiter.known_int(peek)? {
Expand Down
69 changes: 69 additions & 0 deletions tests/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,75 @@ async fn test_json_get_int() {
assert_eq!(display_val(batches).await, (DataType::Int64, "2".to_string()));
}

#[tokio::test]
async fn test_json_get_int_string_parse() {
// string containing int
let batches = run_query(r#"select json_get_int('{"foo": "123"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Int64, "123".to_string()));

// negative string
let batches = run_query(r#"select json_get_int('{"foo": "-42"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Int64, "-42".to_string()));

// non-numeric string returns null
let batches = run_query(r#"select json_get_int('{"foo": "abc"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Int64, String::new()));

// float string returns null (not a valid int)
let batches = run_query(r#"select json_get_int('{"foo": "1.5"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Int64, String::new()));
}

#[tokio::test]
async fn test_json_get_float_string_parse() {
// string containing float
let batches = run_query(r#"select json_get_float('{"foo": "1.5"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Float64, "1.5".to_string()));

// string containing int parses as float
let batches = run_query(r#"select json_get_float('{"foo": "42"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Float64, "42.0".to_string()));

// non-numeric string returns null
let batches = run_query(r#"select json_get_float('{"foo": "abc"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Float64, String::new()));
}

#[tokio::test]
async fn test_json_get_bool_string_parse() {
// string "true"
let batches = run_query(r#"select json_get_bool('{"foo": "true"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Boolean, "true".to_string()));

// string "false"
let batches = run_query(r#"select json_get_bool('{"foo": "false"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Boolean, "false".to_string()));

// non-bool string returns null
let batches = run_query(r#"select json_get_bool('{"foo": "abc"}', 'foo')"#)
.await
.unwrap();
assert_eq!(display_val(batches).await, (DataType::Boolean, String::new()));
}

#[tokio::test]
async fn test_json_get_path() {
let batches = run_query(r#"select json_get('{"i": 19}', 'i')::int<20"#).await.unwrap();
Expand Down
Loading