From 5e0539efa3cbc76f859a27a67038cf2a712ca7a3 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@gmail.com>
Date: Sun, 17 Dec 2017 21:49:36 +0100
Subject: [PATCH] Plan CTEs when subquery pushdown is on

---
 .../distributed/planner/recursive_planning.c  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/backend/distributed/planner/recursive_planning.c b/src/backend/distributed/planner/recursive_planning.c
index b0f765e71..73d36bb5a 100644
--- a/src/backend/distributed/planner/recursive_planning.c
+++ b/src/backend/distributed/planner/recursive_planning.c
@@ -140,6 +140,17 @@ RecursivelyPlanSubqueriesAndCTEs(Query *query,
 	DeferredErrorMessage *error = NULL;
 	RecursivePlanningContext context;
 
+	context.level = 0;
+	context.planId = planId;
+	context.subPlanList = NIL;
+	context.plannerRestrictionContext = plannerRestrictionContext;
+
+	error = RecursivelyPlanCTEs(query, &context);
+	if (error != NULL)
+	{
+		return error;
+	}
+
 	if (SubqueryPushdown)
 	{
 		/*
@@ -155,17 +166,6 @@ RecursivelyPlanSubqueriesAndCTEs(Query *query,
 		return NULL;
 	}
 
-	context.level = 0;
-	context.planId = planId;
-	context.subPlanList = NIL;
-	context.plannerRestrictionContext = plannerRestrictionContext;
-
-	error = RecursivelyPlanCTEs(query, &context);
-	if (error != NULL)
-	{
-		return error;
-	}
-
 	/* XXX: plan subqueries */
 
 	*subPlanList = context.subPlanList;