Commit81c641f

authored and

Sergey Shinderuk

committed

PostgreSQL 15 support.

Pass extra argument to InitPostgres as per upstream commit 31ed3cf746a.

1 parentdf1aa39 commit81c641fCopy full SHA for 81c641f

File tree

+26

-6

lines changed

+26

-6

lines changed

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,12 +350,7 @@ collector_main(Datum main_arg)`
`350`	`350`	`pqsignal(SIGTERM,handle_sigterm);`
`351`	`351`	`pqsignal(SIGUSR1,procsignal_sigusr1_handler);`
`352`	`352`	`BackgroundWorkerUnblockSignals();`
`353`		`-`
`354`		`-#ifPG_VERSION_NUM >=110000`
`355`		`-InitPostgres(NULL,InvalidOid,NULL,InvalidOid,NULL, false);`
`356`		`-#else`
`357`		`-InitPostgres(NULL,InvalidOid,NULL,InvalidOid,NULL);`
`358`		`-#endif`
	`353`	`+InitPostgresCompat(NULL,InvalidOid,NULL,InvalidOid, false, false,NULL);`
`359`	`354`	`SetProcessingMode(NormalProcessing);`
`360`	`355`
`361`	`356`	`/* Make pg_wait_sampling recognisable in pg_stat_activity */`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`#include"postgres.h"`
	`2`	`+`
`2`	`3`	`#include"access/tupdesc.h"`
	`4`	`+#include"miscadmin.h"`
`3`	`5`
`4`	`6`	`#include"pg_wait_sampling.h"`
`5`	`7`
`@@ -33,3 +35,21 @@ CreateTemplateTupleDescCompat(int nattrs, bool hasoid)`
`33`	`35`	`returnCreateTemplateTupleDesc(nattrs,hasoid);`
`34`	`36`	`#endif`
`35`	`37`	`}`
	`38`	`+`
	`39`	`+inlinevoid`
	`40`	`+InitPostgresCompat(constchar*in_dbname,Oiddboid,`
	`41`	`+constchar*username,Oiduseroid,`
	`42`	`+boolload_session_libraries,`
	`43`	`+booloverride_allow_connections,`
	`44`	`+char*out_dbname)`
	`45`	`+{`
	`46`	`+#ifPG_VERSION_NUM >=150000`
	`47`	`+InitPostgres(in_dbname,dboid,username,useroid,load_session_libraries,`
	`48`	`+override_allow_connections,out_dbname);`
	`49`	`+#elifPG_VERSION_NUM >=110000`
	`50`	`+InitPostgres(in_dbname,dboid,username,useroid,out_dbname,`
	`51`	`+override_allow_connections);`
	`52`	`+#else`
	`53`	`+InitPostgres(in_dbname,dboid,username,useroid,out_dbname);`
	`54`	`+#endif`
	`55`	`+}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,10 @@ extern shm_mq_result shm_mq_send_compat(shm_mq_handle *mqh, Size nbytes,`
`88`	`88`	`constvoid*data,boolnowait,`
`89`	`89`	`boolforce_flush);`
`90`	`90`	`externTupleDescCreateTemplateTupleDescCompat(intnattrs,boolhasoid);`
	`91`	`+externvoidInitPostgresCompat(constchar*in_dbname,Oiddboid,`
	`92`	`+constchar*username,Oiduseroid,`
	`93`	`+boolload_session_libraries,`
	`94`	`+booloverride_allow_connections,`
	`95`	`+char*out_dbname);`
`91`	`96`
`92`	`97`	`#endif`

Comments

(0)