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.

diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 08aca0b4b8461f460ad78e0def1b3f1858191e8d..563f1690a18bbd2db31e7655b548af6a99b22e38 100644 (file)
--- 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
        {
                /*