Rename a nonterminal used in SQL/JSON grammar
authorAmit Langote <amitlan@postgresql.org>
Thu, 20 Jul 2023 13:21:43 +0000 (22:21 +0900)
committerAmit Langote <amitlan@postgresql.org>
Wed, 26 Jul 2023 08:06:09 +0000 (17:06 +0900)
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

index 60080e877e8d798c8b2be1a37bf3d6b7d3f06777..e7134add118814d4c26de43a2c2d0b21a9565b6a 100644 (file)
@@ -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);