check for all param types in rel_pathlist_hook, fixes

funbringer · funbringer · commit 98d44c086a04 · 2016-04-20T19:55:13.000+03:00
diff --git a/hooks.c b/hooks.c
@@ -272,8 +272,11 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				quals = extract_actual_clauses(child_rel->baserestrictinfo, false);
 
 				/* Do not proceed if there's a rel containing quals without params */
-				if (!clause_contains_extern_params((Node *) quals))
+				if (!clause_contains_params((Node *) quals))
+				{
+					picky_quals = NIL; /* skip this path */
 					break;
+				}
 
 				/* Replace child Vars with a parent rel's Var */
 				quals = (List *) replace_child_vars_with_parent_var((Node *) quals,
diff --git a/utils.c b/utils.c
@@ -5,31 +5,25 @@
 #include "rewrite/rewriteManip.h"
 
 
-static bool clause_contains_extern_params_walker(Node *node, void *context);
+static bool clause_contains_params_walker(Node *node, void *context);
 
 bool
-clause_contains_extern_params(Node *clause)
+clause_contains_params(Node *clause)
 {
 	return expression_tree_walker(clause,
-								  clause_contains_extern_params_walker,
+								  clause_contains_params_walker,
 								  NULL);
 }
 
 static bool
-clause_contains_extern_params_walker(Node *node, void *context)
+clause_contains_params_walker(Node *node, void *context)
 {
 	if (node == NULL)
 		return false;
 	if (IsA(node, Param))
-	{
-		Param	   *param = (Param *) node;
-
-		if (param->paramkind == PARAM_EXTERN)
-			return true;
-		return false;
-	}
+		return true;
 	return expression_tree_walker(node,
-								  clause_contains_extern_params_walker,
+								  clause_contains_params_walker,
 								  context);
 }
 
diff --git a/utils.h b/utils.h
@@ -12,7 +12,7 @@ typedef struct
 	int			sublevels_up;
 } ReplaceVarsContext;
 
-bool clause_contains_extern_params(Node *clause);
+bool clause_contains_params(Node *clause);
 
 Node * replace_child_vars_with_parent_var(Node *node,
 										  ReplaceVarsContext *context);
