From 306d6e59f7511fef3e05457b15ecad0fc00b5e1e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 19 Apr 2018 18:29:39 -0400 Subject: [PATCH] Fix broken extract_actual_join_clauses call in 9.6 postgres_fdw. In commits e5d83995e et al, I changed the signature of extract_actual_join_clauses, thinking that it was not called from anywhere but createplan.c. I missed that postgres_fdw uses it in the 9.6 branch only. This opens up the question of whether any third-party modules might be calling it, and whether we need to take steps to avoid an API break for them. But for the moment, just get the buildfarm green again. --- contrib/postgres_fdw/postgres_fdw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index 08aca0b4b8..563f1690a1 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -3976,7 +3976,9 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype, /* Separate restrict list into join quals and quals on join relation */ if (IS_OUTER_JOIN(jointype)) - extract_actual_join_clauses(extra->restrictlist, &joinclauses, &otherclauses); + extract_actual_join_clauses(extra->restrictlist, + joinrel->relids, + &joinclauses, &otherclauses); else { /*