Skip to content

Commit 5791b57

Browse files
committed
Fix errors in LISTAGG implementation
1 parent 1ea9ef5 commit 5791b57

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/dsql/parse.y

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -709,17 +709,19 @@ using namespace Firebird;
709709
%token <metaNamePtr> CALL
710710
%token <metaNamePtr> CURRENT_SCHEMA
711711
%token <metaNamePtr> DOWNTO
712+
%token <metaNamePtr> ERROR
712713
%token <metaNamePtr> FORMAT
713714
%token <metaNamePtr> GENERATE_SERIES
714715
%token <metaNamePtr> GREATEST
715716
%token <metaNamePtr> LEAST
717+
%token <metaNamePtr> LISTAGG
716718
%token <metaNamePtr> LTRIM
717719
%token <metaNamePtr> NAMED_ARG_ASSIGN
718720
%token <metaNamePtr> RTRIM
719721
%token <metaNamePtr> SCHEMA
720722
%token <metaNamePtr> SEARCH_PATH
723+
%token <metaNamePtr> TRUNCATE
721724
%token <metaNamePtr> UNLIST
722-
%token <metaNamePtr> LISTAGG
723725
%token <metaNamePtr> WITHIN
724726

725727
// precedence declarations for expression evaluation
@@ -8666,25 +8668,25 @@ overflow_behavior
86668668

86678669
%type <valueExprNode> listagg_truncation_filler_opt
86688670
listagg_truncation_filler_opt
8669-
: /*nothing*/ { $$ = MAKE_str_constant(newIntlString("..."), lex.charSetId); }
8671+
: /* nothing */ { $$ = MAKE_str_constant(newIntlString("..."), lex.charSetId); }
86708672
| listagg_truncation_filler { $$ = $1; }
86718673
;
86728674

8673-
%type <valueExprNode>listagg_truncation_filler
8675+
%type <valueExprNode> listagg_truncation_filler
86748676
listagg_truncation_filler
8675-
: sql_string
8677+
: sql_string { $$ = MAKE_str_constant($1, lex.charSetId); }
86768678
;
86778679

86788680
%type <boolVal> listagg_count_indication
86798681
listagg_count_indication
8680-
: WITH COUNT { $$ = true; }
8682+
: WITH COUNT { $$ = true; }
86818683
| WITHOUT COUNT { $$ = false; }
86828684
;
86838685

86848686
%type <valueListNode> within_group_specification_opt
86858687
within_group_specification_opt
8686-
: /* nothing */ { $$ = newNode<ValueListNode>(0); }
8687-
| within_group_specification { $$ = $1; }
8688+
: /* nothing */ { $$ = newNode<ValueListNode>(0); }
8689+
| within_group_specification { $$ = $1; }
86888690
;
86898691

86908692
%type <valueListNode> within_group_specification

0 commit comments

Comments
 (0)