Commit22212ba

committed

PostgreSQL 17 support.

Caused by: - 4800a5dfb4c46d22b5d05f16c615bea6ff24a2bb (PostgreSQL) Refactor InitPostgres() to use bitwise option flags

1 parent92097fd commit22212baCopy full SHA for 22212ba

File tree

+12

-8

lines changed

+12

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ pgws_collector_main(Datum main_arg)`
`351`	`351`	`pqsignal(SIGTERM,handle_sigterm);`
`352`	`352`	`pqsignal(SIGUSR1,procsignal_sigusr1_handler);`
`353`	`353`	`BackgroundWorkerUnblockSignals();`
`354`		`-InitPostgresCompat(NULL,InvalidOid,NULL,InvalidOid,false, false,NULL);`
	`354`	`+InitPostgresCompat(NULL,InvalidOid,NULL,InvalidOid,0,NULL);`
`355`	`355`	`SetProcessingMode(NormalProcessing);`
`356`	`356`
`357`	`357`	`/* Make pg_wait_sampling recognisable in pg_stat_activity */`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,22 +48,26 @@ shm_mq_send_compat(shm_mq_handle mqh, Size nbytes, const void data,`
`48`	`48`	`#endif`
`49`	`49`	`}`
`50`	`50`
	`51`	`+#ifPG_VERSION_NUM<170000`
	`52`	`+#defineINIT_PG_LOAD_SESSION_LIBS0x0001`
	`53`	`+#defineINIT_PG_OVERRIDE_ALLOW_CONNS0x0002`
	`54`	`+#endif`
	`55`	`+`
`51`	`56`	`staticinlinevoid`
`52`	`57`	`InitPostgresCompat(constchar*in_dbname,Oiddboid,`
`53`	`58`	`constchar*username,Oiduseroid,`
`54`		`-boolload_session_libraries,`
`55`		`-booloverride_allow_connections,`
	`59`	`+bits32flags,`
`56`	`60`	`char*out_dbname)`
`57`	`61`	`{`
`58`	`62`	`#ifPG_VERSION_NUM >=170000`
`59`		`-InitPostgres(in_dbname,dboid,username,useroid, (load_session_libraries ?INIT_PG_LOAD_SESSION_LIBS :0) \|`
`60`		`- (override_allow_connections ?INIT_PG_OVERRIDE_ALLOW_CONNS :0),out_dbname);`
	`63`	`+InitPostgres(in_dbname,dboid,username,useroid,flags,out_dbname);`
`61`	`64`	`#elifPG_VERSION_NUM >=150000`
`62`		`-InitPostgres(in_dbname,dboid,username,useroid,load_session_libraries,`
`63`		`-override_allow_connections,out_dbname);`
	`65`	`+InitPostgres(in_dbname,dboid,username,useroid,`
	`66`	`+flags&INIT_PG_LOAD_SESSION_LIBS,`
	`67`	`+flags&INIT_PG_OVERRIDE_ALLOW_CONNS,out_dbname);`
`64`	`68`	`#elifPG_VERSION_NUM >=110000`
`65`	`69`	`InitPostgres(in_dbname,dboid,username,useroid,out_dbname,`
`66`		`-override_allow_connections);`
	`70`	`+flags&INIT_PG_OVERRIDE_ALLOW_CONNS);`
`67`	`71`	`#else`
`68`	`72`	`InitPostgres(in_dbname,dboid,username,useroid,out_dbname);`
`69`	`73`	`#endif`

Comments

(0)