Skip to content

Commit 60e13be

Browse files
committed
compatibility fixes for 10.4, 9.6.9 and 9.5.13
1 parent 601f53a commit 60e13be

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

Diff for: src/hooks.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
165165
/* Extract join clauses which will separate partitions */
166166
if (IS_OUTER_JOIN(extra->sjinfo->jointype))
167167
{
168-
extract_actual_join_clauses(extra->restrictlist,
169-
&joinclauses, &otherclauses);
168+
extract_actual_join_clauses_compat(extra->restrictlist,
169+
joinrel->relids,
170+
&joinclauses,
171+
&otherclauses);
170172
}
171173
else
172174
{

Diff for: src/include/compat/pg_compat.h

+25
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,31 @@ static inline void mult_result_handler() { elog(ERROR, ERR_PART_ATTR_MULTIPLE_RE
318318
#endif
319319

320320

321+
/*
322+
* extract_actual_join_clauses()
323+
*/
324+
#if (PG_VERSION_NUM >= 100004) || \
325+
(PG_VERSION_NUM < 100000 && PG_VERSION_NUM >= 90609) || \
326+
(PG_VERSION_NUM < 90600 && PG_VERSION_NUM >= 90513)
327+
#define extract_actual_join_clauses_compat(restrictinfo_list, \
328+
joinrelids, \
329+
joinquals, \
330+
otherquals) \
331+
extract_actual_join_clauses((restrictinfo_list), \
332+
(joinrelids), \
333+
(joinquals), \
334+
(otherquals))
335+
#else
336+
#define extract_actual_join_clauses_compat(restrictinfo_list, \
337+
joinrelids, \
338+
joinquals, \
339+
otherquals) \
340+
extract_actual_join_clauses((restrictinfo_list), \
341+
(joinquals), \
342+
(otherquals))
343+
#endif
344+
345+
321346
/*
322347
* get_all_actual_clauses()
323348
*/

0 commit comments

Comments
 (0)