FIx conflict wrt upstream commit 4a4e2442a7f

This commit is contained in:
Julien Rouhaud 2018-04-03 23:05:11 +02:00
parent a41151b455
commit 2006c2477e

View file

@ -1991,7 +1991,7 @@ hypo_get_partition_constraints(PlannerInfo *root, RelOptInfo *rel, hypoTable *pa
*/
constraints = (List *) eval_const_expressions(root, (Node *) constraints);
/* FIXME this func will be modified at pg11 */
constraints = (List *) canonicalize_qual((Expr *) constraints);
constraints = (List *) canonicalize_qual((Expr *) constraints, true);
/* Fix Vars to have the desired varno */
if (rel->relid != 1)