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

Explictly specify pg_catalog path in all system queries

Browse Source
This commit is contained in:
Ian Barwick
2016-09-19 13:12:34 +09:00
parent 4d36712901
commit 178b380f34
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbutils.c
View File

@@ -214,7 +214,7 @@ check_cluster_schema(PGconn *conn)
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT 1 FROM pg_namespace WHERE nspname = '%s'", "SELECT 1 FROM pg_catalog.pg_namespace WHERE nspname = '%s'",
get_repmgr_schema()); get_repmgr_schema());
log_verbose(LOG_DEBUG, "check_cluster_schema(): %s\n", sqlquery); log_verbose(LOG_DEBUG, "check_cluster_schema(): %s\n", sqlquery);
@@ -409,7 +409,7 @@ guc_set(PGconn *conn, const char *parameter, const char *op,
int retval = 1; int retval = 1;
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT true FROM pg_settings " "SELECT true FROM pg_catalog.pg_settings "
" WHERE name = '%s' AND setting %s '%s'", " WHERE name = '%s' AND setting %s '%s'",
parameter, op, value); parameter, op, value);
@@ -445,7 +445,7 @@ guc_set_typed(PGconn *conn, const char *parameter, const char *op,
int retval = 1; int retval = 1;
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT true FROM pg_settings " "SELECT true FROM pg_catalog.pg_settings "
" WHERE name = '%s' AND setting::%s %s '%s'::%s", " WHERE name = '%s' AND setting::%s %s '%s'::%s",
parameter, datatype, op, value, datatype); parameter, datatype, op, value, datatype);
@@ -477,7 +477,7 @@ get_cluster_size(PGconn *conn, char *size)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT pg_catalog.pg_size_pretty(SUM(pg_catalog.pg_database_size(oid))::bigint) " "SELECT pg_catalog.pg_size_pretty(SUM(pg_catalog.pg_database_size(oid))::bigint) "
" FROM pg_database "); " FROM pg_catalog.pg_database ");
log_verbose(LOG_DEBUG, "get_cluster_size():\n%s\n", sqlquery); log_verbose(LOG_DEBUG, "get_cluster_size():\n%s\n", sqlquery);
@@ -508,7 +508,7 @@ get_pg_setting(PGconn *conn, const char *setting, char *output)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT name, setting " "SELECT name, setting "
" FROM pg_settings WHERE name = '%s'", " FROM pg_catalog.pg_settings WHERE name = '%s'",
setting); setting);
log_verbose(LOG_DEBUG, "get_pg_setting(): %s\n", sqlquery); log_verbose(LOG_DEBUG, "get_pg_setting(): %s\n", sqlquery);
@@ -986,13 +986,13 @@ create_replication_slot(PGconn *conn, char *slot_name, int server_version_num)
if (server_version_num >= 90600) if (server_version_num >= 90600)
{ {
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT * FROM pg_create_physical_replication_slot('%s', TRUE)", "SELECT * FROM pg_catalog.pg_create_physical_replication_slot('%s', TRUE)",
slot_name); slot_name);
} }
else else
{ {
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT * FROM pg_create_physical_replication_slot('%s')", "SELECT * FROM pg_catalog.pg_create_physical_replication_slot('%s')",
slot_name); slot_name);
} }
@@ -1022,7 +1022,7 @@ get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT slot_name, slot_type, active " "SELECT slot_name, slot_type, active "
" FROM pg_replication_slots " " FROM pg_catalog.pg_replication_slots "
" WHERE slot_name = '%s' ", " WHERE slot_name = '%s' ",
slot_name); slot_name);

12
repmgr.c
View File

@@ -1561,7 +1561,7 @@ get_tablespace_data(PGconn *upstream_conn, TablespaceDataList *list)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
" SELECT spcname, oid, pg_tablespace_location(oid) AS spclocation " " SELECT spcname, oid, pg_tablespace_location(oid) AS spclocation "
" FROM pg_tablespace " " FROM pg_catalog.pg_tablespace "
" WHERE spcname NOT IN ('pg_default', 'pg_global')"); " WHERE spcname NOT IN ('pg_default', 'pg_global')");
res = PQexec(upstream_conn, sqlquery); res = PQexec(upstream_conn, sqlquery);
@@ -2195,7 +2195,7 @@ do_standby_clone(void)
{ {
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"SELECT spcname " "SELECT spcname "
" FROM pg_tablespace " " FROM pg_catalog.pg_tablespace "
" WHERE pg_tablespace_location(oid) = '%s'", " WHERE pg_tablespace_location(oid) = '%s'",
cell->old_dir); cell->old_dir);
res = PQexec(source_conn, sqlquery); res = PQexec(source_conn, sqlquery);
@@ -2230,7 +2230,7 @@ do_standby_clone(void)
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
" WITH dd AS ( " " WITH dd AS ( "
" SELECT setting " " SELECT setting "
" FROM pg_settings " " FROM pg_catalog.pg_settings "
" WHERE name = 'data_directory' " " WHERE name = 'data_directory' "
" ) " " ) "
" SELECT ps.name, ps.setting, " " SELECT ps.name, ps.setting, "
@@ -4516,15 +4516,15 @@ do_standby_archive_config(void)
"WITH files AS ( " "WITH files AS ( "
" WITH dd AS ( " " WITH dd AS ( "
" SELECT setting " " SELECT setting "
" FROM pg_settings " " FROM pg_catalog.pg_settings "
" WHERE name = 'data_directory') " " WHERE name = 'data_directory') "
" SELECT distinct(sourcefile) AS config_file" " SELECT distinct(sourcefile) AS config_file"
" FROM dd, pg_settings ps " " FROM dd, pg_catalog.pg_settings ps "
" WHERE ps.sourcefile IS NOT NULL " " WHERE ps.sourcefile IS NOT NULL "
" AND ps.sourcefile ~ ('^' || dd.setting) " " AND ps.sourcefile ~ ('^' || dd.setting) "
" UNION " " UNION "
" SELECT ps.setting AS config_file" " SELECT ps.setting AS config_file"
" FROM dd, pg_settings ps " " FROM dd, pg_catalog.pg_settings ps "
" WHERE ps.name IN ( 'config_file', 'hba_file', 'ident_file') " " WHERE ps.name IN ( 'config_file', 'hba_file', 'ident_file') "
" AND ps.setting ~ ('^' || dd.setting) " " AND ps.setting ~ ('^' || dd.setting) "
") " ") "