From f30b953e19ad3580298878ad7cce0eaaa88522bd Mon Sep 17 00:00:00 2001 From: Tobie Morgan Hitchcock Date: Fri, 21 Jan 2022 13:23:28 +0000 Subject: [PATCH] Change DIFF clause to PATCH --- src/sql/data.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sql/data.rs b/src/sql/data.rs index f86476ce..5b0ac69a 100644 --- a/src/sql/data.rs +++ b/src/sql/data.rs @@ -17,7 +17,7 @@ use std::fmt; pub enum Data { EmptyExpression, SetExpression(Vec<(Idiom, Operator, Value)>), - DiffExpression(Array), + PatchExpression(Array), MergeExpression(Object), ReplaceExpression(Object), ContentExpression(Object), @@ -44,7 +44,7 @@ impl fmt::Display for Data { .collect::>() .join(", ") ), - Data::DiffExpression(v) => write!(f, "DIFF {}", v), + Data::PatchExpression(v) => write!(f, "PATCH {}", v), Data::MergeExpression(v) => write!(f, "MERGE {}", v), Data::ReplaceExpression(v) => write!(f, "REPLACE {}", v), Data::ContentExpression(v) => write!(f, "CONTENT {}", v), @@ -79,7 +79,7 @@ impl fmt::Display for Data { } pub fn data(i: &str) -> IResult<&str, Data> { - alt((set, diff, merge, replace, content))(i) + alt((set, patch, merge, replace, content))(i) } fn set(i: &str) -> IResult<&str, Data> { @@ -96,11 +96,11 @@ fn set(i: &str) -> IResult<&str, Data> { Ok((i, Data::SetExpression(v))) } -fn diff(i: &str) -> IResult<&str, Data> { - let (i, _) = tag_no_case("DIFF")(i)?; +fn patch(i: &str) -> IResult<&str, Data> { + let (i, _) = tag_no_case("PATCH")(i)?; let (i, _) = shouldbespace(i)?; let (i, v) = array(i)?; - Ok((i, Data::DiffExpression(v))) + Ok((i, Data::PatchExpression(v))) } fn merge(i: &str) -> IResult<&str, Data> { @@ -191,12 +191,12 @@ mod tests { } #[test] - fn diff_statement() { - let sql = "DIFF [{ field: true }]"; - let res = data(sql); + fn patch_statement() { + let sql = "PATCH [{ field: true }]"; + let res = patch(sql); assert!(res.is_ok()); let out = res.unwrap().1; - assert_eq!("DIFF [{ field: true }]", format!("{}", out)); + assert_eq!("PATCH [{ field: true }]", format!("{}", out)); } #[test]