From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 19 Apr 2018 22:29:39 +0000 (-0400)
Subject: Fix broken extract_actual_join_clauses call in 9.6 postgres_fdw.
X-Git-Tag: REL9_6_9~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=306d6e59f7511fef3e05457b15ecad0fc00b5e1e;p=postgresql

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 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
 	{
 		/*