pathman: check that variable is the partitioning key (bugfix)

zilder · zilder · commit 175b0c866a61 · 2016-05-10T18:46:14.000+03:00
diff --git a/contrib/pg_pathman/pg_pathman.c b/contrib/pg_pathman/pg_pathman.c
@@ -1340,11 +1340,9 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, const PartRelationInfo *prel)
 	result->orig = (const Node *)expr;
 	result->args = NIL;
 
-	if (varnode == NULL || !IsA(varnode, Var))
-	{
-		result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
-		return result;
-	}
+	/* If variable is not the partition key then skip it */
+	if (!varnode || !IsA(varnode, Var) || ((Var *) varnode)->varattno != prel->attnum)
+		goto handle_arrexpr_return;
 
 	if (arraynode && IsA(arraynode, Const) &&
 		!((Const *) arraynode)->constisnull)
@@ -1384,6 +1382,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, const PartRelationInfo *prel)
 		return result;
 	}
 
+handle_arrexpr_return:
 	result->rangeset = list_make1_irange(make_irange(0, prel->children_count - 1, true));
 	return result;
 }
