More schema qualification fix.

This is a follow up to:
https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commit;h=49ca4800d1a804c1f6ef5807d9fbeeef85888fb6

Back patch to all supported branches: 4.4 to 4.0

diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c
index a0818c5e1bc2efd592e6530412532d98423611cb..439ebec3899cb5d4f8129b9fe5315bb1e1e7dc58 100644 (file)
--- a/src/main/pgpool_main.c
+++ b/src/main/pgpool_main.c
@@ -2435,7 +2435,7 @@ verify_backend_node_status(POOL_CONNECTION_POOL_SLOT * *slots)
                if (!slots[i])
                        continue;
 
-               if (get_query_result(slots, i, "SELECT pg_is_in_recovery()", &res))
+               if (get_query_result(slots, i, "SELECT pg_catalog.pg_is_in_recovery()", &res))
                {
                        continue;
                }
@@ -2585,7 +2585,7 @@ verify_backend_node_status(POOL_CONNECTION_POOL_SLOT * *slots)
                                                ereport(DEBUG1,
                                                                (errmsg("verify_backend_node_status: %d is standby", j)));
 
-                                               if (get_query_result(slots, j, "SELECT status, conninfo FROM pg_stat_wal_receiver", &res))
+                                               if (get_query_result(slots, j, "SELECT status, conninfo FROM pg_catalog.pg_stat_wal_receiver", &res))
                                                {
                                                        ereport(DEBUG1,
                                                                        (errmsg("verify_backend_node_status: call pg_stat_wal_receiver to standby %d failed", j)));
@@ -3834,7 +3834,7 @@ get_server_version(POOL_CONNECTION_POOL_SLOT * *slots, int node_id)
 
        if (server_versions[node_id] == 0)
        {
-               query = "SELECT current_setting('server_version_num')";
+               query = "SELECT pg_catalog.current_setting('server_version_num')";
 
                /* Get backend server version. If the query fails, keep previous info. */
                if (get_query_result(slots, node_id, query, &res) == 0)

diff --git a/src/protocol/pool_pg_utils.c b/src/protocol/pool_pg_utils.c
index 34546d27a4e594a55845c5e2864ea43483d7c085..8ae2fd3484b4f1bb09de469c194eb98df2544876 100644 (file)
--- a/src/protocol/pool_pg_utils.c
+++ b/src/protocol/pool_pg_utils.c
@@ -676,7 +676,7 @@ Pgversion(POOL_CONNECTION_POOL * backend)
                /*
                 * Create relcache.
                 */
-               relcache = pool_create_relcache(pool_config->relcache_size, "SELECT version()",
+               relcache = pool_create_relcache(pool_config->relcache_size, "SELECT pg_catalog.version()",
                                                                                string_register_func, string_unregister_func, false);
                if (relcache == NULL)
                {

diff --git a/src/streaming_replication/pool_worker_child.c b/src/streaming_replication/pool_worker_child.c
index 92411ea9ab02b1b9cf3276dc1ce1b86d78f2ffef..31bc1a62a34fb99b2f73008cc84a776b74e66ee7 100644 (file)
--- a/src/streaming_replication/pool_worker_child.c
+++ b/src/streaming_replication/pool_worker_child.c
@@ -393,7 +393,7 @@ check_replication_time_lag(void)
 
                if (server_version[i] == 0)
                {
-                       query = "SELECT current_setting('server_version_num')";
+                       query = "SELECT pg_catalog.current_setting('server_version_num')";
 
                        /*
                         * Get backend server version. If the query fails, keep previous
@@ -411,27 +411,27 @@ check_replication_time_lag(void)
                if (PRIMARY_NODE_ID == i)
                {
                        if (server_version[i] >= PG10_SERVER_VERSION)
-                               query = "SELECT pg_current_wal_lsn()";
+                               query = "SELECT pg_catalog.pg_current_wal_lsn()";
                        else
-                               query = "SELECT pg_current_xlog_location()";
+                               query = "SELECT pg_catalog.pg_current_xlog_location()";
 
                        if (server_version[i] == PG91_SERVER_VERSION)
-                               stat_rep_query = "SELECT application_name, state, '' AS sync_state, '' AS replay_lag FROM pg_stat_replication";
+                               stat_rep_query = "SELECT application_name, state, '' AS sync_state, '' AS replay_lag FROM pg_catalog.pg_stat_replication";
                        else if (server_version[i] >= PG10_SERVER_VERSION)
                        {
-                               stat_rep_query = "SELECT application_name, state, sync_state,(EXTRACT(EPOCH FROM replay_lag)*1000000)::BIGINT FROM pg_stat_replication";
+                               stat_rep_query = "SELECT application_name, state, sync_state,(EXTRACT(EPOCH FROM replay_lag)*1000000)::BIGINT FROM pg_catalog.pg_stat_replication";
                                if (pool_config->delay_threshold_by_time > 0)
                                        replication_delay_by_time = true;
                        }
                        else if (server_version[i] > PG91_SERVER_VERSION)
-                               stat_rep_query = "SELECT application_name, state, sync_state, '' AS replay_lag FROM pg_stat_replication";
+                               stat_rep_query = "SELECT application_name, state, sync_state, '' AS replay_lag FROM pg_catalog.pg_stat_replication";
                }
                else
                {
                        if (server_version[i] >= PG10_SERVER_VERSION)
-                               query = "SELECT pg_last_wal_replay_lsn()";
+                               query = "SELECT pg_catalog.pg_last_wal_replay_lsn()";
                        else
-                               query = "SELECT pg_last_xlog_replay_location()";
+                               query = "SELECT pg_catalog.pg_last_xlog_replay_location()";
 
                        active_standby_node++;
                }