Commit3cd69fb

committed

relaxation of the requirement for calling the old pg_catalog.ptrack_version() function

1 parent7eaac77 commit3cd69fbCopy full SHA for 3cd69fb

File tree

-10

lines changed

-10

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,13 +79,17 @@ get_ptrack_version(PGconn backup_conn, PGNodeInfo nodeInfo)`
`79`	`79`	`return;`
`80`	`80`	`}`
`81`	`81`
`82`		`-res_db=pgut_execute(backup_conn,`
	`82`	`+/*`
	`83`	`+ * it's ok not to have permission to call this old function in PGPRO-11 version (ok_error = true)`
	`84`	`+ * see deprication notice https://postgrespro.com/docs/postgrespro/11/release-pro-11-9-1`
	`85`	`+ */`
	`86`	`+res_db=pgut_execute_extended(backup_conn,`
`83`	`87`	`"SELECT pg_catalog.ptrack_version()",`
`84`		`-0,NULL);`
	`88`	`+0,NULL, true, true);`
`85`	`89`	`if (PQntuples(res_db)==0)`
`86`	`90`	`{`
`87`		`-/* TODO: Something went wrong, should we error out here? */`
`88`	`91`	`PQclear(res_db);`
	`92`	`+elog(WARNING,"Can't call pg_catalog.ptrack_version(), it is assumed that there is no ptrack extension installed.");`
`89`	`93`	`return;`
`90`	`94`	`}`
`91`	`95`	`ptrack_version_str=PQgetvalue(res_db,0,0);`

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -312,16 +312,11 @@ def __init__(self, args, *kwargs):`
`312`	`312`	`self.ptrack=False`
`313`	`313`	`if'PG_PROBACKUP_PTRACK'inself.test_env:`
`314`	`314`	`ifself.test_env['PG_PROBACKUP_PTRACK']=='ON':`
`315`		`-self.ptrack=True`
	`315`	`+ifself.pg_config_version>=self.version_to_num('11.0'):`
	`316`	`+self.ptrack=True`
`316`	`317`
`317`	`318`	`os.environ["PGAPPNAME"]="pg_probackup"`
`318`	`319`
`319`		`-ifself.ptrack:`
`320`		`-self.assertGreaterEqual(`
`321`		`-self.pg_config_version,`
`322`		`-self.version_to_num('11.0'),`
`323`		`-"ptrack testing require PostgreSQL >= 11")`
`324`		`-`
`325`	`320`	`@property`
`326`	`321`	`defpg_config_version(self):`
`327`	`322`	`returnself.version_to_num(`

Comments

(0)