diff options
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/gram.y | 29 | ||||
| -rw-r--r-- | src/backend/parser/parse_clause.c | 14 |
2 files changed, 22 insertions, 21 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 19220971da6..8fced4427b1 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -406,7 +406,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query); a_expr b_expr c_expr AexprConst indirection_el columnref in_expr having_clause func_table array_expr ExclusionWhereClause -%type <list> func_table_item func_table_list opt_col_def_list +%type <list> rowsfrom_item rowsfrom_list opt_col_def_list %type <boolean> opt_ordinality %type <list> ExclusionConstraintList ExclusionConstraintElem %type <list> func_arg_list @@ -9980,13 +9980,13 @@ relation_expr_opt_alias: relation_expr %prec UMINUS /* * func_table represents a function invocation in a FROM list. It can be - * a plain function call, like "foo(...)", or a TABLE expression with - * one or more function calls, "TABLE (foo(...), bar(...))", + * a plain function call, like "foo(...)", or a ROWS FROM expression with + * one or more function calls, "ROWS FROM (foo(...), bar(...))", * optionally with WITH ORDINALITY attached. - * In the TABLE syntax, a column definition list can be given for each + * In the ROWS FROM syntax, a column definition list can be given for each * function, for example: - * TABLE (foo() AS (foo_res_a text, foo_res_b text), - * bar() AS (bar_res_a text, bar_res_b text)) + * ROWS FROM (foo() AS (foo_res_a text, foo_res_b text), + * bar() AS (bar_res_a text, bar_res_b text)) * It's also possible to attach a column definition list to the RangeFunction * as a whole, but that's handled by the table_ref production. */ @@ -9995,29 +9995,30 @@ func_table: func_expr_windowless opt_ordinality RangeFunction *n = makeNode(RangeFunction); n->lateral = false; n->ordinality = $2; - n->is_table = false; + n->is_rowsfrom = false; n->functions = list_make1(list_make2($1, NIL)); /* alias and coldeflist are set by table_ref production */ $$ = (Node *) n; } - | TABLE '(' func_table_list ')' opt_ordinality + | ROWS FROM '(' rowsfrom_list ')' opt_ordinality { RangeFunction *n = makeNode(RangeFunction); n->lateral = false; - n->ordinality = $5; - n->is_table = true; - n->functions = $3; + n->ordinality = $6; + n->is_rowsfrom = true; + n->functions = $4; /* alias and coldeflist are set by table_ref production */ $$ = (Node *) n; } ; -func_table_item: func_expr_windowless opt_col_def_list +rowsfrom_item: func_expr_windowless opt_col_def_list { $$ = list_make2($1, $2); } ; -func_table_list: func_table_item { $$ = list_make1($1); } - | func_table_list ',' func_table_item { $$ = lappend($1, $3); } +rowsfrom_list: + rowsfrom_item { $$ = list_make1($1); } + | rowsfrom_list ',' rowsfrom_item { $$ = lappend($1, $3); } ; opt_col_def_list: AS '(' TableFuncElementList ')' { $$ = $3; } diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c index 8b4c0ae0d3b..939fa834e0a 100644 --- a/src/backend/parser/parse_clause.c +++ b/src/backend/parser/parse_clause.c @@ -655,25 +655,25 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r) * expansion) and no WITH ORDINALITY. The reason for the latter * restriction is that it's not real clear whether the ordinality column * should be in the coldeflist, and users are too likely to make mistakes - * in one direction or the other. Putting the coldeflist inside TABLE() - * is much clearer in this case. + * in one direction or the other. Putting the coldeflist inside ROWS + * FROM() is much clearer in this case. */ if (r->coldeflist) { if (list_length(funcexprs) != 1) { - if (r->is_table) + if (r->is_rowsfrom) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("TABLE() with multiple functions cannot have a column definition list"), - errhint("Put a separate column definition list for each function inside TABLE()."), + errmsg("ROWS FROM() with multiple functions cannot have a column definition list"), + errhint("Put a separate column definition list for each function inside ROWS FROM()."), parser_errposition(pstate, exprLocation((Node *) r->coldeflist)))); else ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("UNNEST() with multiple arguments cannot have a column definition list"), - errhint("Use separate UNNEST() calls inside TABLE(), and attach a column definition list to each one."), + errhint("Use separate UNNEST() calls inside ROWS FROM(), and attach a column definition list to each one."), parser_errposition(pstate, exprLocation((Node *) r->coldeflist)))); } @@ -681,7 +681,7 @@ transformRangeFunction(ParseState *pstate, RangeFunction *r) ereport(ERROR, (errcode(ERRCODE_SYNTAX_ERROR), errmsg("WITH ORDINALITY cannot be used with a column definition list"), - errhint("Put the column definition list inside TABLE()."), + errhint("Put the column definition list inside ROWS FROM()."), parser_errposition(pstate, exprLocation((Node *) r->coldeflist)))); |