NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit254ac5a

committed

Rename a nonterminal used in SQL/JSON grammar

This renames json_output_clause_opt to json_returning_clause_opt,because the new name makes more sense given that the governingkeyword is RETURNING.Per suggestion from Álvaro Herrera.Discussion:https://postgr.es/m/20230707122820.wy5zlmhn4tdzbojl%40alvherre.pgsql

1 parentb22391a commit254ac5aCopy full SHA for 254ac5a

File tree

1 file changed

-9

lines changed

src/backend/parser
- gram.y

1 file changed

-9

lines changed

`‎src/backend/parser/gram.y‎`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`647`	`647`
`648`	`648`	`%type<node>json_format_clause_opt`
`649`	`649`	`json_value_expr`
`650`		`-json_output_clause_opt`
	`650`	`+json_returning_clause_opt`
`651`	`651`	`json_name_and_value`
`652`	`652`	`json_aggregate_func`
`653`	`653`	`%type<list>json_name_and_value_list`
`@@ -15570,7 +15570,7 @@ func_expr_common_subexpr:`
`15570`	`15570`	`\|JSON_OBJECT'('json_name_and_value_list`
`15571`	`15571`	`json_object_constructor_null_clause_opt`
`15572`	`15572`	`json_key_uniqueness_constraint_opt`
`15573`		`-json_output_clause_opt')'`
	`15573`	`+json_returning_clause_opt')'`
`15574`	`15574`	`{`
`15575`	`15575`	`JsonObjectConstructor *n = makeNode(JsonObjectConstructor);`
`15576`	`15576`
`@@ -15581,7 +15581,7 @@ func_expr_common_subexpr:`
`15581`	`15581`	`n->location =@1;`
`15582`	`15582`	`$$ = (Node *) n;`
`15583`	`15583`	`}`
`15584`		`-\|JSON_OBJECT'('json_output_clause_opt')'`
	`15584`	`+\|JSON_OBJECT'('json_returning_clause_opt')'`
`15585`	`15585`	`{`
`15586`	`15586`	`JsonObjectConstructor *n = makeNode(JsonObjectConstructor);`
`15587`	`15587`
`@@ -15595,7 +15595,7 @@ func_expr_common_subexpr:`
`15595`	`15595`	`\|JSON_ARRAY'('`
`15596`	`15596`	`json_value_expr_list`
`15597`	`15597`	`json_array_constructor_null_clause_opt`
`15598`		`-json_output_clause_opt`
	`15598`	`+json_returning_clause_opt`
`15599`	`15599`	`')'`
`15600`	`15600`	`{`
`15601`	`15601`	`JsonArrayConstructor *n = makeNode(JsonArrayConstructor);`
`@@ -15610,7 +15610,7 @@ func_expr_common_subexpr:`
`15610`	`15610`	`select_no_parens`
`15611`	`15611`	`json_format_clause_opt`
`15612`	`15612`	`/* json_array_constructor_null_clause_opt*/`
`15613`		`-json_output_clause_opt`
	`15613`	`+json_returning_clause_opt`
`15614`	`15614`	`')'`
`15615`	`15615`	`{`
`15616`	`15616`	`JsonArrayQueryConstructor *n = makeNode(JsonArrayQueryConstructor);`
`@@ -15623,7 +15623,7 @@ func_expr_common_subexpr:`
`15623`	`15623`	`$$ = (Node *) n;`
`15624`	`15624`	`}`
`15625`	`15625`	`\|JSON_ARRAY'('`
`15626`		`-json_output_clause_opt`
	`15626`	`+json_returning_clause_opt`
`15627`	`15627`	`')'`
`15628`	`15628`	`{`
`15629`	`15629`	`JsonArrayConstructor *n = makeNode(JsonArrayConstructor);`
`@@ -16384,7 +16384,7 @@ json_encoding_clause_opt:`
`16384`	`16384`	`\|/* EMPTY*/{ $$ = JS_ENC_DEFAULT; }`
`16385`	`16385`	`;`
`16386`	`16386`
`16387`		`-json_output_clause_opt:`
	`16387`	`+json_returning_clause_opt:`
`16388`	`16388`	`RETURNING Typename json_format_clause_opt`
`16389`	`16389`	`{`
`16390`	`16390`	`JsonOutput *n =makeNode(JsonOutput);`
`@@ -16457,7 +16457,7 @@ json_aggregate_func:`
`16457`	`16457`	`json_name_and_value`
`16458`	`16458`	`json_object_constructor_null_clause_opt`
`16459`	`16459`	`json_key_uniqueness_constraint_opt`
`16460`		`-json_output_clause_opt`
	`16460`	`+json_returning_clause_opt`
`16461`	`16461`	`')'`
`16462`	`16462`	`{`
`16463`	`16463`	`JsonObjectAgg *n =makeNode(JsonObjectAgg);`
`@@ -16475,7 +16475,7 @@ json_aggregate_func:`
`16475`	`16475`	`json_value_expr`
`16476`	`16476`	`json_array_aggregate_order_by_clause_opt`
`16477`	`16477`	`json_array_constructor_null_clause_opt`
`16478`		`-json_output_clause_opt`
	`16478`	`+json_returning_clause_opt`
`16479`	`16479`	`')'`
`16480`	`16480`	`{`
`16481`	`16481`	`JsonArrayAgg *n =makeNode(JsonArrayAgg);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit254ac5a

File tree

1 file changed

1 file changed

`‎src/backend/parser/gram.y‎`

0 commit comments