From 106d68fd611f3c2f46f9c84256de0fab79b1ab44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=96nder=20Kalac=C4=B1?= <onder@citusdata.com>
Date: Fri, 16 Jul 2021 18:13:18 +0200
Subject: [PATCH] CLUSTER ON deparser should consider schemas (#5122)

(cherry picked from commit 87a51ae5529f2f0a3998f4b954894361b66560c8)
---
 src/backend/distributed/deparser/citus_ruleutils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/deparser/citus_ruleutils.c b/src/backend/distributed/deparser/citus_ruleutils.c
index 28d83918c..755c15589 100644
--- a/src/backend/distributed/deparser/citus_ruleutils.c
+++ b/src/backend/distributed/deparser/citus_ruleutils.c
@@ -1025,12 +1025,13 @@ pg_get_indexclusterdef_string(Oid indexRelationId)
 	/* check if the table is clustered on this index */
 	if (indexForm->indisclustered)
 	{
-		char *tableName = generate_relation_name(tableRelationId, NIL);
+		char *qualifiedRelationName =
+			generate_qualified_relation_name(tableRelationId);
 		char *indexName = get_rel_name(indexRelationId); /* needs to be quoted */
 
 		initStringInfo(&buffer);
 		appendStringInfo(&buffer, "ALTER TABLE %s CLUSTER ON %s",
-						 tableName, quote_identifier(indexName));
+						 qualifiedRelationName, quote_identifier(indexName));
 	}
 
 	ReleaseSysCache(indexTuple);