Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitafddc65

Browse files
authored
Merge pull request#249 from postgrespro/PGPRO-6764
 PGPRO-6857: fix build for PostgreSQL 15
2 parents52260fa +33b4d47 commitafddc65

File tree

3 files changed

+36
-7
lines changed

3 files changed

+36
-7
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-
#ifPG_VERSION_NUM >=100000
638+
#ifPG_VERSION_NUM >=150000/* for commit 791b1b71da35 */
639+
#defineparse_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+
#elifPG_VERSION_NUM >=100000
639644
#defineparse_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-
#ifPG_VERSION_NUM >=100000
661+
#ifPG_VERSION_NUM >=150000/* for commit 791b1b71da35 */
662+
#definepg_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+
#elifPG_VERSION_NUM >=100000
657667
#definepg_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+
#ifPG_VERSION_NUM >=150000/* for commit 7103ebb7aae8 */
783+
#defineExecBRUpdateTriggersCompat(estate,epqstate,relinfo, \
784+
tupleid,fdw_trigtuple,newslot) \
785+
ExecBRUpdateTriggers((estate), (epqstate), (relinfo), (tupleid), \
786+
(fdw_trigtuple), (newslot), NULL)
787+
#else
788+
#defineExecBRUpdateTriggersCompat(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-
#ifPG_VERSION_NUM >=100000
828+
#ifPG_VERSION_NUM >=150000/* for commit ba9a7e392171 */
829+
#defineExecARDeleteTriggersCompat(estate,relinfo,tupleid, \
830+
fdw_trigtuple,transition_capture) \
831+
ExecARDeleteTriggers((estate), (relinfo), (tupleid), \
832+
(fdw_trigtuple), (transition_capture), false)
833+
#elifPG_VERSION_NUM >=100000
805834
#defineExecARDeleteTriggersCompat(estate,relinfo,tupleid, \
806835
fdw_trigtuple,transition_capture) \
807836
ExecARDeleteTriggers((estate), (relinfo), (tupleid), \

‎src/partition_creation.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,14 +1671,14 @@ make_constraint_common(char *name, Node *raw_expr)
16711671
returnconstraint;
16721672
}
16731673

1674-
#ifPG_VERSION_NUM >=150000/*reason: commit 639a86e36aae */
1674+
#ifPG_VERSION_NUM >=150000/*for commits 639a86e36aae, c4cc2850f4d1 */
16751675
staticString
16761676
make_string_value_struct(char*str)
16771677
{
16781678
Stringval;
16791679

16801680
val.type=T_String;
1681-
val.val=str;
1681+
val.sval=str;
16821682

16831683
returnval;
16841684
}
@@ -1689,7 +1689,7 @@ make_int_value_struct(int int_val)
16891689
Integerval;
16901690

16911691
val.type=T_Integer;
1692-
val.val=int_val;
1692+
val.ival=int_val;
16931693

16941694
returnval;
16951695
}

‎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
#ifPG_VERSION_NUM >=120000
526-
if (!ExecBRUpdateTriggers(estate,epqstate,rri,tupleid,NULL,slot))
526+
if (!ExecBRUpdateTriggersCompat(estate,epqstate,rri,tupleid,NULL,slot))
527527
returnNULL;
528528
#else
529529
slot=ExecBRUpdateTriggers(estate,epqstate,rri,tupleid,NULL,slot);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp