Replace the function is_supported_version() with the function pg_version()

the main difference is that this new function doesn't return a bool but
a string representing the current major version of the postgresql server
or an empty string if it's earlier than 9.0.
Teach all commands that could connect to master and standby that they
both should have the same major version.
This commit is contained in:
Jaime Casanova
2010-10-23 15:27:24 -05:00
parent 8409727f0c
commit 219b4431b4
4 changed files with 110 additions and 15 deletions

View File

@@ -56,13 +56,21 @@ is_standby(PGconn *conn)
}
bool
is_supported_version(PGconn *conn)
/*
* If postgreSQL version is 9 or superior returns the major version
* if 8 or inferior returns an empty string
*/
char *
pg_version(PGconn *conn)
{
PGresult *res;
int major_version;
char *major_version;
res = PQexec(conn, "SELECT split_part(split_part(version(), ' ', 2), '.', 1)");
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");
if (PQresultStatus(res) != PGRES_TUPLES_OK)
{
fprintf(stderr, "PQexec failed: %s", PQerrorMessage(conn));
@@ -70,10 +78,20 @@ is_supported_version(PGconn *conn)
PQfinish(conn);
exit(1);
}
major_version = atoi(PQgetvalue(res, 0, 0));
major_version1 = atoi(PQgetvalue(res, 0, 0));
major_version2 = PQgetvalue(res, 0, 1);
PQclear(res);
return (major_version >= 9) ? true : false;
major_version = malloc(10);
if (major_version1 >= 9)
{
/* form a major version string */
sprintf(major_version, "%d.%s", major_version1, major_version2);
}
else
strcpy(major_version, "");
return major_version;
}