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

Jump to bottom

feat: add binary between expression #117

Merged
merged 2 commits into from
Mar 14, 2023
Merged

feat: add binary between expression #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8622bb
feat: add binary between expression
matthias-Q Mar 5, 2023
8763900
remove parser artifacts
matthias-Q Mar 14, 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
17 changes: 17 additions & 0 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ module.exports = grammar({
'binary_relation',
'binary_concat',
'pattern_matching',
'between',
'clause_connective',
'clause_disjunctive',
],
Expand Down Expand Up @@ -1765,6 +1766,7 @@ module.exports = grammar({
$.unary_expression,
$.array,
$.interval,
$.between_expression,
)
),

Expand Down Expand Up @@ -1826,6 +1828,21 @@ module.exports = grammar({
),
),

between_expression: $ => choice(
...[
[$.keyword_between, 'between'],
[seq($.keyword_not, $.keyword_between), 'between'],
].map(([operator, precedence]) =>
prec.left(precedence, seq(
field('left', $._expression),
field('operator', operator),
field('low', $._expression),
$.keyword_and,
field('high', $._expression)
))
),
),

subquery: $ => seq(
'(',
$.select,
Expand Down
213 changes: 142 additions & 71 deletions test/corpus/select.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ SELECT tab."COL" FROM tab;
(table_reference
name: (identifier))))))


================================================================================
Simple select with where
================================================================================
Expand Down Expand Up @@ -1307,35 +1306,35 @@ ON c.id = d.c_id;
name: (identifier))
right: (field
table_alias: (identifier)
name: (identifier))))
(join
(keyword_left)
(keyword_join)
(relation
(table_reference
name: (identifier))
table_alias: (identifier))
(join
(keyword_join)
(relation
(table_reference
name: (identifier))
table_alias: (identifier))
(keyword_on)
predicate: (binary_expression
left: (field
table_alias: (identifier)
name: (identifier))
right: (field
table_alias: (identifier)
name: (identifier))))
(keyword_on)
predicate: (binary_expression
left: (field
table_alias: (identifier)
name: (identifier))
right: (field
table_alias: (identifier)
name: (identifier))))
(join
(keyword_left)
(keyword_join)
(relation
(table_reference
name: (identifier))
table_alias: (identifier))
(join
(keyword_join)
(relation
(table_reference
name: (identifier))
table_alias: (identifier))
(keyword_on)
predicate: (binary_expression
left: (field
table_alias: (identifier)
name: (identifier))
right: (field
table_alias: (identifier)
name: (identifier))))
(keyword_on)
predicate: (binary_expression
left: (field
table_alias: (identifier)
name: (identifier))
right: (field
table_alias: (identifier)
name: (identifier)))))))

================================================================================
Expand Down Expand Up @@ -2216,27 +2215,28 @@ Select with positive and negative integers
SELECT a + 3 from b where a >= -14

--------------------------------------------------------------------------------

(program
(statement
(select
(keyword_select)
(select_expression
(term
value: (binary_expression
(select
(keyword_select)
(select_expression
(term
value: (binary_expression
left: (field
name: (identifier))
right: (literal)))))
(from
(keyword_from)
(relation
(table_reference
name: (identifier)))
(where
(keyword_where)
predicate: (binary_expression
left: (field
name: (identifier))
right: (literal)))))
(from
(keyword_from)
(relation
(table_reference
name: (identifier)))
(where
(keyword_where)
predicate: (binary_expression
left: (field
name: (identifier))
right: (literal))))))
right: (literal))))))

================================================================================
Select with positive and negative floats
Expand All @@ -2245,27 +2245,28 @@ Select with positive and negative floats
SELECT a + 3.1415 from b where a >= -3.14

--------------------------------------------------------------------------------

(program
(statement
(select
(keyword_select)
(select_expression
(term
value: (binary_expression
(select
(keyword_select)
(select_expression
(term
value: (binary_expression
left: (field
name: (identifier))
right: (literal)))))
(from
(keyword_from)
(relation
(table_reference
name: (identifier)))
(where
(keyword_where)
predicate: (binary_expression
left: (field
name: (identifier))
right: (literal)))))
(from
(keyword_from)
(relation
(table_reference
name: (identifier)))
(where
(keyword_where)
predicate: (binary_expression
left: (field
name: (identifier))
right: (literal))))))
right: (literal))))))

================================================================================
Select intervals
Expand All @@ -2274,15 +2275,16 @@ Select intervals
SELECT interval '1m'

--------------------------------------------------------------------------------

(program
(statement
(select
(keyword_select)
(select_expression
(term
value: (interval
(keyword_interval)
(interval_definitions)))))))
(select
(keyword_select)
(select_expression
(term
value: (interval
(keyword_interval)
(interval_definitions)))))))

================================================================================
Select with string literals containing single quotes
Expand Down Expand Up @@ -2331,3 +2333,72 @@ SELECT 'foo''''''bar';
(select_expression
(term
(literal))))))

================================================================================
Select between timestamps
================================================================================

select
a
from b
where a between '2022-01-01' and '2023-01-01'

--------------------------------------------------------------------------------

(program
(statement
(select
(keyword_select)
(select_expression
(term
(field
(identifier)))))
(from
(keyword_from)
(relation
(table_reference
(identifier)))
(where
(keyword_where)
(between_expression
(field
(identifier))
(keyword_between)
(literal)
(keyword_and)
(literal))))))

================================================================================
Select not between range
================================================================================

select
a
from b
where a not between 1 and 3

--------------------------------------------------------------------------------

(program
(statement
(select
(keyword_select)
(select_expression
(term
(field
(identifier)))))
(from
(keyword_from)
(relation
(table_reference
(identifier)))
(where
(keyword_where)
(between_expression
(field
(identifier))
(keyword_not)
(keyword_between)
(literal)
(keyword_and)
(literal))))))