This is an automated email from the ASF dual-hosted git repository.
jgemignani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/age.git
The following commit(s) were added to refs/heads/master by this push:
new ed08b870 Make CALL YIELD grammar more precise (#1852)
ed08b870 is described below
commit ed08b870bf419ed5d82619e800f2645c00fc317e
Author: Rafsun Masud <[email protected]>
AuthorDate: Fri May 17 14:31:44 2024 -0700
Make CALL YIELD grammar more precise (#1852)
Replaces `CALL expr . expr` to `CALL expr_var . expr_func_norm`. There was
a if-block before that checked if the first `expr` is a ColumnRef and the
second `expr` is a FuncCall node. That check is not need now since expr_var
and expr_func_norm are reduced to ColumnRef and FuncCall node respectively.
This change also prevents shift\reduce ambiguity with CALL subquery syntax.
---
src/backend/parser/cypher_gram.y | 98 ++++++++++++++++------------------------
1 file changed, 40 insertions(+), 58 deletions(-)
diff --git a/src/backend/parser/cypher_gram.y b/src/backend/parser/cypher_gram.y
index d6637193..2ae83bcc 100644
--- a/src/backend/parser/cypher_gram.y
+++ b/src/backend/parser/cypher_gram.y
@@ -391,44 +391,35 @@ call_stmt:
$$ = (Node *)n;
}
- | CALL expr '.' expr
+ | CALL expr_var '.' expr_func_norm
{
cypher_call *n = make_ag_node(cypher_call);
+ FuncCall *fc = (FuncCall*)$4;
+ ColumnRef *cr = (ColumnRef*)$2;
+ List *fields = cr->fields;
+ String *string = linitial(fields);
- if (IsA($4, FuncCall) && IsA($2, ColumnRef))
+ /*
+ * A function can only be qualified with a single schema. So, we
+ * check to see that the function isn't already qualified. There
+ * may be unforeseen cases where we might need to remove this in
+ * the future.
+ */
+ if (list_length(fc->funcname) == 1)
{
- FuncCall *fc = (FuncCall*)$4;
- ColumnRef *cr = (ColumnRef*)$2;
- List *fields = cr->fields;
- String *string = linitial(fields);
-
- /*
- * A function can only be qualified with a single schema. So,
we
- * check to see that the function isn't already qualified.
There
- * may be unforeseen cases where we might need to remove this
in
- * the future.
- */
- if (list_length(fc->funcname) == 1)
- {
- fc->funcname = lcons(string, fc->funcname);
- $$ = (Node*)fc;
- }
- else
- ereport(ERROR,
- (errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("function already qualified"),
- ag_scanner_errposition(@1, scanner)));
-
- n->funccall = fc;
- $$ = (Node *)n;
+ fc->funcname = lcons(string, fc->funcname);
+ $$ = (Node*)fc;
}
else
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("CALL statement must be a qualified function"),
- ag_scanner_errposition(@1, scanner)));
+ errmsg("function already qualified"),
+ ag_scanner_errposition(@1, scanner)));
}
+
+ n->funccall = fc;
+ $$ = (Node *)n;
}
| CALL expr_func_norm YIELD yield_item_list where_opt
{
@@ -438,46 +429,37 @@ call_stmt:
n->where = $5;
$$ = (Node *)n;
}
- | CALL expr '.' expr YIELD yield_item_list where_opt
+ | CALL expr_var '.' expr_func_norm YIELD yield_item_list where_opt
{
cypher_call *n = make_ag_node(cypher_call);
+ FuncCall *fc = (FuncCall*)$4;
+ ColumnRef *cr = (ColumnRef*)$2;
+ List *fields = cr->fields;
+ String *string = linitial(fields);
- if (IsA($4, FuncCall) && IsA($2, ColumnRef))
+ /*
+ * A function can only be qualified with a single schema. So, we
+ * check to see that the function isn't already qualified. There
+ * may be unforeseen cases where we might need to remove this in
+ * the future.
+ */
+ if (list_length(fc->funcname) == 1)
{
- FuncCall *fc = (FuncCall*)$4;
- ColumnRef *cr = (ColumnRef*)$2;
- List *fields = cr->fields;
- String *string = linitial(fields);
-
- /*
- * A function can only be qualified with a single schema. So,
we
- * check to see that the function isn't already qualified.
There
- * may be unforeseen cases where we might need to remove this
in
- * the future.
- */
- if (list_length(fc->funcname) == 1)
- {
- fc->funcname = lcons(string, fc->funcname);
- $$ = (Node*)fc;
- }
- else
- ereport(ERROR,
- (errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("function already qualified"),
- ag_scanner_errposition(@1, scanner)));
-
- n->funccall = fc;
- n->yield_items = $6;
- n->where = $7;
- $$ = (Node *)n;
+ fc->funcname = lcons(string, fc->funcname);
+ $$ = (Node*)fc;
}
else
{
ereport(ERROR,
(errcode(ERRCODE_SYNTAX_ERROR),
- errmsg("CALL statement must be a qualified function"),
- ag_scanner_errposition(@1, scanner)));
+ errmsg("function already qualified"),
+ ag_scanner_errposition(@1, scanner)));
}
+
+ n->funccall = fc;
+ n->yield_items = $6;
+ n->where = $7;
+ $$ = (Node *)n;
}
;
