From 29ed28623d08527e2c0d5dc547d128b93d29b3d7 Mon Sep 17 00:00:00 2001
From: Burak Velioglu <buvelio@microsoft.com>
Date: Mon, 7 Mar 2022 15:29:02 +0300
Subject: [PATCH] Guard against missing address function

---
 src/backend/distributed/commands/utility_hook.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c
index a554af20a..04ba4d209 100644
--- a/src/backend/distributed/commands/utility_hook.c
+++ b/src/backend/distributed/commands/utility_hook.c
@@ -666,8 +666,11 @@ ProcessUtilityInternal(PlannedStmt *pstmt,
 		 * MarkObjectDistributedLocally since altering already distributed object won't
 		 * call MarkObjectDistributedLocally but will hit the check here.
 		 */
-		ObjectAddress targetObject = GetObjectAddressFromParseTree(parsetree, false);
-		ErrorIfCircularDependencyExists(&targetObject);
+		if (ops && ops->address)
+		{
+			ObjectAddress targetObject = GetObjectAddressFromParseTree(parsetree, true);
+			ErrorIfCircularDependencyExists(&targetObject);
+		}
 
 		if (ops && ops->postprocess)
 		{