Support parenthesized syntax for CLUSTER without a table name.

nathan-bossart · nathan-bossart · commit cdaedfc96d14 · 2023-07-19T15:26:52.000-07:00
b5913f6 added a parenthesized syntax for CLUSTER, but it requires specifying a table name. This is unlike commands such as VACUUM and ANALYZE, which do not require specifying a table in the parenthesized syntax. This change resolves this inconsistency. This is preparatory work for a follow-up commit that will move the unparenthesized syntax to the "Compatibility" section of the CLUSTER documentation. Reviewed-by: Melanie Plageman, Michael Paquier Discussion: https://postgr.es/m/CAAKRu_bc5uHieG1976kGqJKxyWtyQt9yvktjsVX%2Bi7NOigDjOA%40mail.gmail.com
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLUSTER [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">index_name</replaceable> ]
+CLUSTER [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] [ <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">index_name</replaceable> ] ]
 CLUSTER [ VERBOSE ] [ <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">index_name</replaceable> ] ]
 
 <phrase>where <replaceable class="parameter">option</replaceable> can be one of:</phrase>
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11553,7 +11553,7 @@ CreateConversionStmt:
 /*****************************************************************************
  *
  *		QUERY:
- *				CLUSTER (options) <qualified_name> [ USING <index_name> ]
+ *				CLUSTER (options) [ <qualified_name> [ USING <index_name> ] ]
  *				CLUSTER [VERBOSE] [ <qualified_name> [ USING <index_name> ] ]
  *				CLUSTER [VERBOSE] <index_name> ON <qualified_name> (for pre-8.3)
  *
@@ -11569,6 +11569,15 @@ ClusterStmt:
 					n->params = $3;
 					$$ = (Node *) n;
 				}
+			| CLUSTER '(' utility_option_list ')'
+				{
+					ClusterStmt *n = makeNode(ClusterStmt);
+
+					n->relation = NULL;
+					n->indexname = NULL;
+					n->params = $3;
+					$$ = (Node *) n;
+				}
 			/* unparenthesized VERBOSE kept for pre-14 compatibility */
 			| CLUSTER opt_verbose qualified_name cluster_index_specification
 				{
@@ -11581,6 +11590,7 @@ ClusterStmt:
 						n->params = lappend(n->params, makeDefElem("verbose", NULL, @2));
 					$$ = (Node *) n;
 				}
+			/* unparenthesized VERBOSE kept for pre-17 compatibility */
 			| CLUSTER opt_verbose
 				{
 					ClusterStmt *n = makeNode(ClusterStmt);

Original file line number	Diff line number	Diff line change
`@@ -11553,7 +11553,7 @@ CreateConversionStmt:`
`11553`	`11553`	`/*****************************************************************************`
`11554`	`11554`	`*`
`11555`	`11555`	`* QUERY:`
`11556`		`- * CLUSTER (options) <qualified_name> [ USING <index_name> ]`
	`11556`	`+ * CLUSTER (options) [ <qualified_name> [ USING <index_name> ] ]`
`11557`	`11557`	`* CLUSTER [VERBOSE] [ <qualified_name> [ USING <index_name> ] ]`
`11558`	`11558`	`* CLUSTER [VERBOSE] <index_name> ON <qualified_name> (for pre-8.3)`
`11559`	`11559`	`*`
`@@ -11569,6 +11569,15 @@ ClusterStmt:`
`11569`	`11569`	`n->params = $3;`
`11570`	`11570`	`$$ = (Node *) n;`
`11571`	`11571`	`}`
	`11572`	`+ \| CLUSTER '(' utility_option_list ')'`
	`11573`	`+ {`
	`11574`	`+ ClusterStmt *n = makeNode(ClusterStmt);`
	`11575`	`+`
	`11576`	`+ n->relation = NULL;`
	`11577`	`+ n->indexname = NULL;`
	`11578`	`+ n->params = $3;`
	`11579`	`+ $$ = (Node *) n;`
	`11580`	`+ }`
`11572`	`11581`	`/* unparenthesized VERBOSE kept for pre-14 compatibility */`
`11573`	`11582`	`\| CLUSTER opt_verbose qualified_name cluster_index_specification`
`11574`	`11583`	`{`
`@@ -11581,6 +11590,7 @@ ClusterStmt:`
`11581`	`11590`	`n->params = lappend(n->params, makeDefElem("verbose", NULL, @2));`
`11582`	`11591`	`$$ = (Node *) n;`
`11583`	`11592`	`}`
	`11593`	`+ /* unparenthesized VERBOSE kept for pre-17 compatibility */`
`11584`	`11594`	`\| CLUSTER opt_verbose`
`11585`	`11595`	`{`
`11586`	`11596`	`ClusterStmt *n = makeNode(ClusterStmt);`