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

do not exit in guc_setted and guc_setted_typed

Browse Source
This commit is contained in:
Christian Kruse
2014-01-16 14:48:46 +01:00
parent 77aa6aa326
commit 6f149ead8f
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dbutils.c
View File

@@ -213,12 +213,13 @@ pg_version(PGconn *conn, char* major_version)
}
bool
int
guc_setted(PGconn *conn, const char *parameter, const char *op,
const char *value)
{
PGresult *res;
char sqlquery[QUERY_STR_LEN];
int retval = 1;
sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings "
" WHERE name = '%s' AND setting %s '%s'",
@@ -229,30 +230,29 @@ guc_setted(PGconn *conn, const char *parameter, const char *op,
{
log_err(_("GUC setting check PQexec failed: %s"),
PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
exit(ERR_DB_QUERY);
retval = -1;
}
if (PQntuples(res) == 0)
else if (PQntuples(res) == 0)
{
PQclear(res);
return false;
retval = 0;
}
PQclear(res);
return true;
return retval;
}
/**
* Just like guc_setted except with an extra parameter containing the name of
* the pg datatype so that the comparison can be done properly.
*/
bool
int
guc_setted_typed(PGconn *conn, const char *parameter, const char *op,
const char *value, const char *datatype)
{
PGresult *res;
char sqlquery[QUERY_STR_LEN];
int retval = 1;
sqlquery_snprintf(sqlquery, "SELECT true FROM pg_settings "
" WHERE name = '%s' AND setting::%s %s '%s'::%s",
@@ -263,18 +263,16 @@ guc_setted_typed(PGconn *conn, const char *parameter, const char *op,
{
log_err(_("GUC setting check PQexec failed: %s"),
PQerrorMessage(conn));
PQclear(res);
PQfinish(conn);
exit(ERR_DB_QUERY);
retval = -1;
}
if (PQntuples(res) == 0)
else if (PQntuples(res) == 0)
{
PQclear(res);
return false;
retval = 0;
}
PQclear(res);
return true;
return retval;
}