Skip to content

Added support for DISTINCT and GROUP BY #23

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for DISTINCT and GROUP BY #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions src/parser.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,12 @@ sql = _ body:select_query _
select_query
= select _
top:(top _ v:top_specification { return v })? _
distinct:distinct? _
select:select_specification _
from:(from _ v:from_specification { return v })? _
where:(where _ v:filter_condition { return v })? _
orderBy:(order _ by _ v:sort_specification { return v })?
orderBy:(order _ by _ v:sort_specification { return v })? _
groupBy:(group _ by _ v:group_specification { return v })?
{
return {
type: 'select_query',
Expand Down Expand Up @@ -131,6 +133,16 @@ sort_expression
order
}
}

group_specification
= head:scalar_expression tail:(_ "," _ v:scalar_expression { return v })*
{
return {
type: 'group_specification',
expressions: [head, ...tail]
}
}


scalar_expression
= scalar_conditional_expression
Expand Down Expand Up @@ -218,7 +230,7 @@ number_constant
}

string_constant
= "\"" chars:double_string_character* "\""
= '"' chars:double_string_character* '"'
{
return {
type: "string_constant",
Expand Down Expand Up @@ -265,10 +277,12 @@ comment

select = "SELECT"i !identifier_start
top = "TOP"i !identifier_start
distinct = "DISTINCT"i !identifier_start
from = "FROM"i !identifier_start
where = "WHERE"i !identifier_start
order = "ORDER"i !identifier_start
by = "BY"i !identifier_start
group = "GROUP"i !identifier_start
as = "AS"i !identifier_start
join = "JOIN"i !identifier_start
in = "IN"i !identifier_start
Expand All @@ -289,10 +303,12 @@ udf = "udf" !identifier_start
reserved
= select
/ top
/ distinct
/ from
/ where
/ order
/ by
/ group
/ as
/ join
/ in
Expand Down