Skip to content
Merged
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
10 changes: 4 additions & 6 deletions src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,19 +144,17 @@ impl<'a> Parser<'a> {
expect_keyword(self.shift(), "by")?;

let expr = self.parse_expr()?;
let token = self.shift();
let token = self.peek();

if let Sym::Id(name) = token.sym {
let order = if name.eq_ignore_ascii_case("asc") {
self.shift();
Order::Asc
} else if name.eq_ignore_ascii_case("desc") {
self.shift();
Order::Desc
} else {
return Err(ParserError::UnexpectedToken(
token.line,
token.col,
name.to_owned(),
));
Order::Asc
};

return Ok(OrderBy { expr, order });
Expand Down
6 changes: 6 additions & 0 deletions src/tests/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,9 @@ fn test_parser_with_comment() {
let tokens = tokenize(include_str!("./resources/with_comment.eql")).unwrap();
insta::assert_yaml_snapshot!(parse(tokens.as_slice()));
}

#[test]
fn test_parser_order_by_no_ordering() {
let tokens = tokenize(include_str!("./resources/query_order_by_no_ordering.eql")).unwrap();
insta::assert_yaml_snapshot!(parse(tokens.as_slice()));
}
3 changes: 3 additions & 0 deletions src/tests/resources/query_order_by_no_ordering.eql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM e IN events
ORDER BY e.data.price
PROJECT INTO e
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
source: src/tests/parser.rs
expression: parse(tokens.as_slice())
---
Ok:
attrs:
pos:
line: 1
col: 1
sources:
- binding:
name: e
pos:
line: 1
col: 6
kind:
Name: events
predicate: ~
group_by: ~
order_by:
expr:
attrs:
pos:
line: 2
col: 10
value:
Access:
target:
attrs:
pos:
line: 2
col: 10
value:
Access:
target:
attrs:
pos:
line: 2
col: 10
value:
Id: e
field: data
field: price
order: Asc
limit: ~
projection:
attrs:
pos:
line: 3
col: 14
value:
Id: e
distinct: false
meta: ~