Skip to content

EXCEPT DISTINCT parsed to EXCEPT ALL + order_by and window_frame are an optional field #82

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
JordyHeusdensDT wants to merge 3 commits into
base: master
Choose a base branch
from
Open

EXCEPT DISTINCT parsed to EXCEPT ALL + order_by and window_frame are an optional field #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ac45e
Properly parse EXCEPT DISTINCT
JordyHeusdensDT Jan 7, 2022
756f0a2
order_by field optional in ResolvedAnalyticFunctionGroup
JordyHeusdensDT Jan 7, 2022
9841852
window_frame field optional in ResolvedAnalyticFunctionCall
JordyHeusdensDT Jan 7, 2022
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
4 changes: 2 additions & 2 deletions zetasql/resolved_ast/gen_resolved_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,7 @@ def main(argv):

<window_frame> can be NULL.
""",
fields=[Field('window_frame', 'ResolvedWindowFrame', tag_id=2)])
fields=[Field('window_frame', 'ResolvedWindowFrame', tag_id=2, ignorable=IGNORABLE)])

gen.AddNode(
name='ResolvedExtendedCastElement',
Expand Down Expand Up @@ -4701,7 +4701,7 @@ def main(argv):
""",
fields=[
Field('partition_by', 'ResolvedWindowPartitioning', tag_id=2),
Field('order_by', 'ResolvedWindowOrdering', tag_id=3),
Field('order_by', 'ResolvedWindowOrdering', tag_id=3, ignorable=IGNORABLE),
Field(
'analytic_function_list',
'ResolvedComputedColumn',
Expand Down
2 changes: 1 addition & 1 deletion zetasql/resolved_ast/sql_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2568,7 +2568,7 @@ std::pair<std::string, std::string> GetOpTypePair(
case ResolvedSetOperationScan::EXCEPT_ALL:
return std::make_pair("EXCEPT", "ALL");
case ResolvedSetOperationScan::EXCEPT_DISTINCT:
return std::make_pair("EXCEPT", "ALL");
return std::make_pair("EXCEPT", "DISTINCT");
}
}

Expand Down