Skip to content

Commit 33b4d47

Browse files
author
Marina Polyakova
committed
PGPRO-6857: fix build for PostgreSQL 15
- In the commit 791b1b71da35d9d4264f72a87e4078b85a2fcfb4 the functions parse_analyze and pg_analyze_and_rewrite were renamed to parse_analyze_fixedparams and pg_analyze_and_rewrite_fixedparams respectively. - The commit 7103ebb7aae8ab8076b7e85f335ceb8fe799097c added a new argument tmfd to the function ExecBRUpdateTriggers. - The commit ba9a7e392171c83eb3332a757279e7088487f9a2 added a new argmument is_crosspart_update to the function ExecARDeleteTriggers.
1 parent 31f1012 commit 33b4d47

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

src/include/compat/pg_compat.h

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,12 @@ extern int oid_cmp(const void *p1, const void *p2);
635635
*
636636
* for v10 cast first arg to RawStmt type
637637
*/
638-
#if PG_VERSION_NUM >= 100000
638+
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
639+
#define parse_analyze_compat(parse_tree, query_string, param_types, nparams, \
640+
query_env) \
641+
parse_analyze_fixedparams((RawStmt *) (parse_tree), (query_string), (param_types), \
642+
(nparams), (query_env))
643+
#elif PG_VERSION_NUM >= 100000
639644
#define parse_analyze_compat(parse_tree, query_string, param_types, nparams, \
640645
query_env) \
641646
parse_analyze((RawStmt *) (parse_tree), (query_string), (param_types), \
@@ -653,7 +658,12 @@ extern int oid_cmp(const void *p1, const void *p2);
653658
*
654659
* for v10 cast first arg to RawStmt type
655660
*/
656-
#if PG_VERSION_NUM >= 100000
661+
#if PG_VERSION_NUM >= 150000 /* for commit 791b1b71da35 */
662+
#define pg_analyze_and_rewrite_compat(parsetree, query_string, param_types, \
663+
nparams, query_env) \
664+
pg_analyze_and_rewrite_fixedparams((RawStmt *) (parsetree), (query_string), \
665+
(param_types), (nparams), (query_env))
666+
#elif PG_VERSION_NUM >= 100000
657667
#define pg_analyze_and_rewrite_compat(parsetree, query_string, param_types, \
658668
nparams, query_env) \
659669
pg_analyze_and_rewrite((RawStmt *) (parsetree), (query_string), \
@@ -766,6 +776,20 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
766776
#include "access/tupconvert.h"
767777
#endif
768778

779+
/*
780+
* ExecBRUpdateTriggers()
781+
*/
782+
#if PG_VERSION_NUM >= 150000 /* for commit 7103ebb7aae8 */
783+
#define ExecBRUpdateTriggersCompat(estate, epqstate, relinfo, \
784+
tupleid, fdw_trigtuple, newslot) \
785+
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
786+
(fdw_trigtuple), (newslot), NULL)
787+
#else
788+
#define ExecBRUpdateTriggersCompat(estate, epqstate, relinfo, \
789+
tupleid, fdw_trigtuple, newslot) \
790+
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
791+
(fdw_trigtuple), (newslot))
792+
#endif
769793

770794
/*
771795
* ExecARInsertTriggers()
@@ -801,7 +825,12 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
801825
/*
802826
* ExecARDeleteTriggers()
803827
*/
804-
#if PG_VERSION_NUM >= 100000
828+
#if PG_VERSION_NUM >= 150000 /* for commit ba9a7e392171 */
829+
#define ExecARDeleteTriggersCompat(estate, relinfo, tupleid, \
830+
fdw_trigtuple, transition_capture) \
831+
ExecARDeleteTriggers((estate), (relinfo), (tupleid), \
832+
(fdw_trigtuple), (transition_capture), false)
833+
#elif PG_VERSION_NUM >= 100000
805834
#define ExecARDeleteTriggersCompat(estate, relinfo, tupleid, \
806835
fdw_trigtuple, transition_capture) \
807836
ExecARDeleteTriggers((estate), (relinfo), (tupleid), \

src/partition_router.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ router_lock_or_delete_tuple(PartitionRouterState *state,
523523
rri->ri_TrigDesc->trig_update_before_row)
524524
{
525525
#if PG_VERSION_NUM >= 120000
526-
if (!ExecBRUpdateTriggers(estate, epqstate, rri, tupleid, NULL, slot))
526+
if (!ExecBRUpdateTriggersCompat(estate, epqstate, rri, tupleid, NULL, slot))
527527
return NULL;
528528
#else
529529
slot = ExecBRUpdateTriggers(estate, epqstate, rri, tupleid, NULL, slot);

0 commit comments

Comments
 (0)