From d8ac45eaff17b7015f0047271b3d841b4e41dbb8 Mon Sep 17 00:00:00 2001 From: JordyHeusdensDT Date: Fri, 7 Jan 2022 14:09:46 +0100 Subject: [PATCH 1/3] Properly parse EXCEPT DISTINCT --- zetasql/resolved_ast/sql_builder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zetasql/resolved_ast/sql_builder.cc b/zetasql/resolved_ast/sql_builder.cc index 67859a470..93cd6c71b 100644 --- a/zetasql/resolved_ast/sql_builder.cc +++ b/zetasql/resolved_ast/sql_builder.cc @@ -2568,7 +2568,7 @@ std::pair 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"); } } From 756f0a26f7a7a34227ab7196964cad428d5c581a Mon Sep 17 00:00:00 2001 From: JordyHeusdensDT Date: Fri, 7 Jan 2022 14:11:09 +0100 Subject: [PATCH 2/3] order_by field optional in ResolvedAnalyticFunctionGroup --- zetasql/resolved_ast/gen_resolved_ast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zetasql/resolved_ast/gen_resolved_ast.py b/zetasql/resolved_ast/gen_resolved_ast.py index e7534f05f..fa17d3412 100644 --- a/zetasql/resolved_ast/gen_resolved_ast.py +++ b/zetasql/resolved_ast/gen_resolved_ast.py @@ -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', From 9841852a43d07282523a4b3bb4a7ae461ee25255 Mon Sep 17 00:00:00 2001 From: JordyHeusdensDT Date: Fri, 7 Jan 2022 14:12:05 +0100 Subject: [PATCH 3/3] window_frame field optional in ResolvedAnalyticFunctionCall --- zetasql/resolved_ast/gen_resolved_ast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zetasql/resolved_ast/gen_resolved_ast.py b/zetasql/resolved_ast/gen_resolved_ast.py index fa17d3412..f8a0c598e 100644 --- a/zetasql/resolved_ast/gen_resolved_ast.py +++ b/zetasql/resolved_ast/gen_resolved_ast.py @@ -1481,7 +1481,7 @@ def main(argv): 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',