v10-0002-Rename-a-nonterminal-used-in-SQL-JSON-grammar.patch
application/octet-stream
Filename: v10-0002-Rename-a-nonterminal-used-in-SQL-JSON-grammar.patch
Type: application/octet-stream
Part: 0
Message:
Re: remaining sql/json patches
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v10-0002
Subject: Rename a nonterminal used in SQL/JSON grammar
| File | + | − |
|---|---|---|
| src/backend/parser/gram.y | 9 | 9 |
From 4b40008b5055c02241b8e5b77ad26bc588035a13 Mon Sep 17 00:00:00 2001
From: Amit Langote <amitlan@postgresql.org>
Date: Thu, 20 Jul 2023 22:21:43 +0900
Subject: [PATCH v10 2/6] Rename a nonterminal used in SQL/JSON grammar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
---
src/backend/parser/gram.y | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 60080e877e..e7134add11 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -647,7 +647,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%type <node> json_format_clause_opt
json_value_expr
- json_output_clause_opt
+ json_returning_clause_opt
json_name_and_value
json_aggregate_func
%type <list> json_name_and_value_list
@@ -15570,7 +15570,7 @@ func_expr_common_subexpr:
| JSON_OBJECT '(' json_name_and_value_list
json_object_constructor_null_clause_opt
json_key_uniqueness_constraint_opt
- json_output_clause_opt ')'
+ json_returning_clause_opt ')'
{
JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
@@ -15581,7 +15581,7 @@ func_expr_common_subexpr:
n->location = @1;
$$ = (Node *) n;
}
- | JSON_OBJECT '(' json_output_clause_opt ')'
+ | JSON_OBJECT '(' json_returning_clause_opt ')'
{
JsonObjectConstructor *n = makeNode(JsonObjectConstructor);
@@ -15595,7 +15595,7 @@ func_expr_common_subexpr:
| JSON_ARRAY '('
json_value_expr_list
json_array_constructor_null_clause_opt
- json_output_clause_opt
+ json_returning_clause_opt
')'
{
JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
@@ -15610,7 +15610,7 @@ func_expr_common_subexpr:
select_no_parens
json_format_clause_opt
/* json_array_constructor_null_clause_opt */
- json_output_clause_opt
+ json_returning_clause_opt
')'
{
JsonArrayQueryConstructor *n = makeNode(JsonArrayQueryConstructor);
@@ -15623,7 +15623,7 @@ func_expr_common_subexpr:
$$ = (Node *) n;
}
| JSON_ARRAY '('
- json_output_clause_opt
+ json_returning_clause_opt
')'
{
JsonArrayConstructor *n = makeNode(JsonArrayConstructor);
@@ -16384,7 +16384,7 @@ json_encoding_clause_opt:
| /* EMPTY */ { $$ = JS_ENC_DEFAULT; }
;
-json_output_clause_opt:
+json_returning_clause_opt:
RETURNING Typename json_format_clause_opt
{
JsonOutput *n = makeNode(JsonOutput);
@@ -16457,7 +16457,7 @@ json_aggregate_func:
json_name_and_value
json_object_constructor_null_clause_opt
json_key_uniqueness_constraint_opt
- json_output_clause_opt
+ json_returning_clause_opt
')'
{
JsonObjectAgg *n = makeNode(JsonObjectAgg);
@@ -16475,7 +16475,7 @@ json_aggregate_func:
json_value_expr
json_array_aggregate_order_by_clause_opt
json_array_constructor_null_clause_opt
- json_output_clause_opt
+ json_returning_clause_opt
')'
{
JsonArrayAgg *n = makeNode(JsonArrayAgg);
--
2.35.3