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

Reorder OUTPUT clause values and make NULL default

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-01-27 11:18:41 +00:00
parent 0f4f07d5d3
commit 76f249589a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/sql/output.rs
View file

@ -9,8 +9,8 @@ use std::fmt;
#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)] #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
pub enum Output { pub enum Output {
Null,
None, None,
Null,
Diff, Diff,
After, After,
Before, Before,
@ -19,7 +19,7 @@ pub enum Output {
impl Default for Output { impl Default for Output {
fn default() -> Output { fn default() -> Output {
Output::Null Output::None
} }
} }
@ -27,8 +27,8 @@ impl fmt::Display for Output {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "RETURN ")?; write!(f, "RETURN ")?;
match self { match self {
Output::Null => write!(f, "NULL"),
Output::None => write!(f, "NONE"), Output::None => write!(f, "NONE"),
Output::Null => write!(f, "NULL"),
Output::Diff => write!(f, "DIFF"), Output::Diff => write!(f, "DIFF"),
Output::After => write!(f, "AFTER"), Output::After => write!(f, "AFTER"),
Output::Before => write!(f, "BEFORE"), Output::Before => write!(f, "BEFORE"),
@ -41,8 +41,8 @@ pub fn output(i: &str) -> IResult<&str, Output> {
let (i, _) = tag_no_case("RETURN")(i)?; let (i, _) = tag_no_case("RETURN")(i)?;
let (i, _) = shouldbespace(i)?; let (i, _) = shouldbespace(i)?;
let (i, v) = alt(( let (i, v) = alt((
map(tag_no_case("NULL"), |_| Output::Null),
map(tag_no_case("NONE"), |_| Output::None), map(tag_no_case("NONE"), |_| Output::None),
map(tag_no_case("NULL"), |_| Output::Null),
map(tag_no_case("DIFF"), |_| Output::Diff), map(tag_no_case("DIFF"), |_| Output::Diff),
map(tag_no_case("AFTER"), |_| Output::After), map(tag_no_case("AFTER"), |_| Output::After),
map(tag_no_case("BEFORE"), |_| Output::Before), map(tag_no_case("BEFORE"), |_| Output::Before),