database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Rename a nonterminal used in SQL/JSON grammar

Browse Source 
This renames json_output_clause_opt to json_returning_clause_opt,
because the new name makes more sense given that the governing
keyword is RETURNING.

Per suggestion from Álvaro Herrera.

Discussion: https://postgr.es/m/20230707122820.wy5zlmhn4tdzbojl%40alvherre.pgsql
This commit is contained in:
Amit Langote
2023-07-20 22:21:43 +09:00
parent b22391a2ff
commit 254ac5a7c3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/parser/gram.y
View File

@@ -647,7 +647,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%type <node> json_format_clause_opt %type <node> json_format_clause_opt
json_value_expr json_value_expr
json_output_clause_opt json_returning_clause_opt
json_name_and_value json_name_and_value
json_aggregate_func json_aggregate_func
%type <list> json_name_and_value_list %type <list> json_name_and_value_list
@@ -15570,7 +15570,7 @@ func_expr_common_subexpr:
| JSON_OBJECT '(' json_name_and_value_list | JSON_OBJECT '(' json_name_and_value_list
json_object_constructor_null_clause_opt json_object_constructor_null_clause_opt
json_key_uniqueness_constraint_opt json_key_uniqueness_constraint_opt
json_output_clause_opt ')' json_returning_clause_opt ')'
{ {
JsonObjectConstructor *n = makeNode(JsonObjectConstructor); JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
@@ -15581,7 +15581,7 @@ func_expr_common_subexpr:
n->location = @1; n->location = @1;
$$ = (Node *) n; $$ = (Node *) n;
} }
| JSON_OBJECT '(' json_output_clause_opt ')' | JSON_OBJECT '(' json_returning_clause_opt ')'
{ {
JsonObjectConstructor *n = makeNode(JsonObjectConstructor); JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
@@ -15595,7 +15595,7 @@ func_expr_common_subexpr:
| JSON_ARRAY '(' | JSON_ARRAY '('
json_value_expr_list json_value_expr_list
json_array_constructor_null_clause_opt json_array_constructor_null_clause_opt
json_output_clause_opt json_returning_clause_opt
')' ')'
{ {
JsonArrayConstructor *n = makeNode(JsonArrayConstructor); JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
@@ -15610,7 +15610,7 @@ func_expr_common_subexpr:
select_no_parens select_no_parens
json_format_clause_opt json_format_clause_opt
/* json_array_constructor_null_clause_opt */ /* json_array_constructor_null_clause_opt */
json_output_clause_opt json_returning_clause_opt
')' ')'
{ {
JsonArrayQueryConstructor *n = makeNode(JsonArrayQueryConstructor); JsonArrayQueryConstructor *n = makeNode(JsonArrayQueryConstructor);
@@ -15623,7 +15623,7 @@ func_expr_common_subexpr:
$$ = (Node *) n; $$ = (Node *) n;
} }
| JSON_ARRAY '(' | JSON_ARRAY '('
json_output_clause_opt json_returning_clause_opt
')' ')'
{ {
JsonArrayConstructor *n = makeNode(JsonArrayConstructor); JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
@@ -16384,7 +16384,7 @@ json_encoding_clause_opt:
| /* EMPTY */ { $$ = JS_ENC_DEFAULT; } | /* EMPTY */ { $$ = JS_ENC_DEFAULT; }
; ;
json_output_clause_opt: json_returning_clause_opt:
RETURNING Typename json_format_clause_opt RETURNING Typename json_format_clause_opt
{ {
JsonOutput *n = makeNode(JsonOutput); JsonOutput *n = makeNode(JsonOutput);
@@ -16457,7 +16457,7 @@ json_aggregate_func:
json_name_and_value json_name_and_value
json_object_constructor_null_clause_opt json_object_constructor_null_clause_opt
json_key_uniqueness_constraint_opt json_key_uniqueness_constraint_opt
json_output_clause_opt json_returning_clause_opt
')' ')'
{ {
JsonObjectAgg *n = makeNode(JsonObjectAgg); JsonObjectAgg *n = makeNode(JsonObjectAgg);
@@ -16475,7 +16475,7 @@ json_aggregate_func:
json_value_expr json_value_expr
json_array_aggregate_order_by_clause_opt json_array_aggregate_order_by_clause_opt
json_array_constructor_null_clause_opt json_array_constructor_null_clause_opt
json_output_clause_opt json_returning_clause_opt
')' ')'
{ {
JsonArrayAgg *n = makeNode(JsonArrayAgg); JsonArrayAgg *n = makeNode(JsonArrayAgg);