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.

Sign up for GitHub

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

[#49] Fix bug producing false positives in filters #50

Merged
merged 5 commits into from
Jul 13, 2023
+36 −12
Merged

[#49] Fix bug producing false positives in filters #50

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66d22b1
fix a bug in singular query evaluation that was producing false posit…
hiltontj Jul 13, 2023
451e18e
Update Changelogs for `serde_json_path` and `serde_json_path_core`
hiltontj Jul 13, 2023
fe41030
Use a more functional syntax for less branching
hiltontj Jul 13, 2023
21cb864
Make the note in changelog clearer as it pertains to issue fixed
hiltontj Jul 13, 2023
9af60b9
fix a typo in changelog
hiltontj Jul 13, 2023
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
13 changes: 13 additions & 0 deletions serde_json_path/tests/regressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
use serde_json::json;
use serde_json_path::JsonPath;
#[cfg(feature = "trace")]
use test_log::test;

// This test is meant for issue #49, which can be found here:
// https://github.com/hiltontj/serde_json_path/issues/49
#[test]
fn issue_49() {
let value = json!({"a": 1, "b": 2});
let path = JsonPath::parse("$[?(@.a == 2)]").expect("parses JSONPath");
assert!(path.query(&value).is_empty());
}
6 changes: 6 additions & 0 deletions serde_json_path_core/src/spec/selector/filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ impl std::fmt::Display for Comparable {

impl Comparable {
#[doc(hidden)]
#[cfg_attr(feature = "trace", tracing::instrument(name = "Comparable::as_value", level = "trace", parent = None, ret))]
pub fn as_value<'a, 'b: 'a>(
&'a self,
current: &'b Value,
Expand Down Expand Up @@ -493,6 +494,7 @@ pub struct SingularQuery {

impl SingularQuery {
/// Evaluate the singular query
#[cfg_attr(feature = "trace", tracing::instrument(name = "SingularQuery::eval_query", level = "trace", parent = None, ret))]
pub fn eval_query<'b>(&self, current: &'b Value, root: &'b Value) -> Option<&'b Value> {
let mut target = match self.kind {
SingularQueryKind::Absolute => root,
Expand All @@ -507,6 +509,8 @@ impl SingularQuery {
} else {
return None;
}
} else {
return None;
}
}
SingularQuerySegment::Index(index) => {
Expand All @@ -516,6 +520,8 @@ impl SingularQuery {
} else {
return None;
}
} else {
return None;
}
}
}
Expand Down