github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Refactor version number detection

Browse Source 
Use the reported `server_version_num` integer for version number
detection and comparison. This makes it easier to set an arbitrary
minimum supported version (rather than "9.0 or later") as well
as future-proofing for 10.x and later.
This commit is contained in:
Ian Barwick
2014-12-29 14:54:04 +09:00
parent 4c64d52afb
commit f94626bf7b
5 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dbutils.c
View File

@@ -178,46 +178,24 @@ is_pgup(PGconn *conn, int timeout)
/*
* If postgreSQL version is 9 or superior returns the major version
* if 8 or inferior returns an empty string
* Return the server version number for the connection provided
*/
char *
pg_version(PGconn *conn, char *major_version)
int
get_server_version_num(PGconn *conn)
{
PGresult *res;
int major_version1;
char *major_version2;
res = PQexec(conn,
"WITH pg_version(ver) AS "
"(SELECT split_part(version(), ' ', 2)) "
"SELECT split_part(ver, '.', 1), split_part(ver, '.', 2) "
"FROM pg_version");
"SELECT current_setting('server_version_num')");
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
log_err(_("Version check PQexec failed: %s"),
log_err(_("Unable to determine server verson number:\n%s"),
PQerrorMessage(conn));
PQclear(res);
return NULL;
return -1;
}
major_version1 = atoi(PQgetvalue(res, 0, 0));
major_version2 = PQgetvalue(res, 0, 1);
if (major_version1 >= 9)
{
/* form a major version string */
xsnprintf(major_version, MAXVERSIONSTR, "%d.%s", major_version1,
major_version2);
}
else
strcpy(major_version, "");
PQclear(res);
return major_version;
return atoi(PQgetvalue(res, 0, 0));
}