Rename a parse node to be more general

petere · petere · commit 91d1f2d30210 · 2021-03-25T10:06:32.000+01:00
A WHERE clause will be used for row filtering in logical replication. We already have a similar node: 'WHERE (condition here)'. Let's rename the node to a generic name and use it for row filtering too. Author: Euler Taveira <euler.taveira@enterprisedb.com> Discussion: https://www.postgresql.org/message-id/flat/CAHE3wggb715X+mK_DitLXF25B=jE6xyNCH4YOwM860JR7HarGQ@mail.gmail.com
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -495,7 +495,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <node>	def_arg columnElem where_clause where_or_current_clause
 				a_expr b_expr c_expr AexprConst indirection_el opt_slice_bound
 				columnref in_expr having_clause func_table xmltable array_expr
-				ExclusionWhereClause operator_def_arg
+				OptWhereClause operator_def_arg
 %type <list>	rowsfrom_item rowsfrom_list opt_col_def_list
 %type <boolean> opt_ordinality
 %type <list>	ExclusionConstraintList ExclusionConstraintElem
@@ -3837,7 +3837,7 @@ ConstraintElem:
 					$$ = (Node *)n;
 				}
 			| EXCLUDE access_method_clause '(' ExclusionConstraintList ')'
-				opt_c_include opt_definition OptConsTableSpace  ExclusionWhereClause
+				opt_c_include opt_definition OptConsTableSpace  OptWhereClause
 				ConstraintAttributeSpec
 				{
 					Constraint *n = makeNode(Constraint);
@@ -3939,7 +3939,7 @@ ExclusionConstraintElem: index_elem WITH any_operator
 			}
 		;
 
-ExclusionWhereClause:
+OptWhereClause:
 			WHERE '(' a_expr ')'					{ $$ = $3; }
 			| /*EMPTY*/								{ $$ = NULL; }
 		;

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`495`	`495`	`%type <node> def_arg columnElem where_clause where_or_current_clause`
`496`	`496`	`a_expr b_expr c_expr AexprConst indirection_el opt_slice_bound`
`497`	`497`	`columnref in_expr having_clause func_table xmltable array_expr`
`498`		`- ExclusionWhereClause operator_def_arg`
	`498`	`+ OptWhereClause operator_def_arg`
`499`	`499`	`%type <list> rowsfrom_item rowsfrom_list opt_col_def_list`
`500`	`500`	`%type <boolean> opt_ordinality`
`501`	`501`	`%type <list> ExclusionConstraintList ExclusionConstraintElem`
`@@ -3837,7 +3837,7 @@ ConstraintElem:`
`3837`	`3837`	`$$ = (Node *)n;`
`3838`	`3838`	`}`
`3839`	`3839`	`\| EXCLUDE access_method_clause '(' ExclusionConstraintList ')'`
`3840`		`- opt_c_include opt_definition OptConsTableSpace ExclusionWhereClause`
	`3840`	`+ opt_c_include opt_definition OptConsTableSpace OptWhereClause`
`3841`	`3841`	`ConstraintAttributeSpec`
`3842`	`3842`	`{`
`3843`	`3843`	`Constraint *n = makeNode(Constraint);`
`@@ -3939,7 +3939,7 @@ ExclusionConstraintElem: index_elem WITH any_operator`
`3939`	`3939`	`}`
`3940`	`3940`	`;`
`3941`	`3941`
`3942`		`-ExclusionWhereClause:`
	`3942`	`+OptWhereClause:`
`3943`	`3943`	`WHERE '(' a_expr ')' { $$ = $3; }`
`3944`	`3944`	`\| /EMPTY/ { $$ = NULL; }`
`3945`	`3945`	`;`