From 3d5660cb3f6d525027413bdf35764fe5bb1bd464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <gunkmute@gmail.com>
Date: Tue, 14 Apr 2020 05:22:10 +0000
Subject: [PATCH] subqueryEntryList needs to come from queryTree, not
 originalQuery

---
 src/backend/distributed/planner/multi_logical_planner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/distributed/planner/multi_logical_planner.c b/src/backend/distributed/planner/multi_logical_planner.c
index 9d2ce45de..ea84dacd1 100644
--- a/src/backend/distributed/planner/multi_logical_planner.c
+++ b/src/backend/distributed/planner/multi_logical_planner.c
@@ -672,7 +672,7 @@ MultiNodeTree(Query *originalQuery, Query *queryTree)
 	 * If we have a subquery, build a multi table node for the subquery and
 	 * add a collect node on top of the multi table node.
 	 */
-	List *subqueryEntryList = SubqueryEntryList(originalQuery);
+	List *subqueryEntryList = SubqueryEntryList(queryTree);
 	if (subqueryEntryList != NIL)
 	{
 		MultiCollect *subqueryCollectNode = CitusMakeNode(MultiCollect);