1: fix for postgres 10, finished

Author: NikolayS

init/generate.sh

@@ -14,15 +14,13 @@ cat > "$OUT" <<- VersCheck
 
 select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\\\1')::numeric >= 10 as postgres_dba_pgvers_10plus \gset
 \if :postgres_dba_pgvers_10plus
-  \set funcname_last_wal_receive_lsn pg_last_wal_receive_lsn
-  \set funcname_last_wal_replay_lsn pg_last_wal_replay_lsn
-  \set funcname_is_wal_replay_paused pg_is_wal_replay_paused
-  \echo VERSION 10+++
+  \set postgres_dba_last_wal_receive_lsn pg_last_wal_receive_lsn
+  \set postgres_dba_last_wal_replay_lsn pg_last_wal_replay_lsn
+  \set postgres_dba_is_wal_replay_paused pg_is_wal_replay_paused
 \else
-  \set funcname_last_wal_receive_lsn pg_last_xlog_receive_location
-  \set funcname_last_wal_replay_lsn pg_last_xlog_replay_location
-  \set funcname_is_wal_replay_paused pg_is_xlog_replay_paused
-  \echo VERS < 10 !!
+  \set postgres_dba_last_wal_receive_lsn pg_last_xlog_receive_location
+  \set postgres_dba_last_wal_replay_lsn pg_last_xlog_replay_location
+  \set postgres_dba_is_wal_replay_paused pg_is_xlog_replay_paused
 \endif
 
 -- TODO: improve work with custom GUCs for Postgres 9.5 and older

sql/1_basic.sql

@@ -11,10 +11,10 @@ select
   case
     when pg_is_in_recovery()  then 'Replica' || ' (delay: '
       || ((((case
-          when :funcname_last_xlog_receive_location() = :funcname_last_xlog_replay_location() then 0
+          when :postgres_dba_last_wal_receive_lsn() = :postgres_dba_last_wal_replay_lsn() then 0
           else extract (epoch from now() - pg_last_xact_replay_timestamp())
         end)::int)::text || ' second')::interval)::text
-      || '; paused: ' || :funcname_is_xlog_replay_paused()::text || ')'
+      || '; paused: ' || :postgres_dba_is_wal_replay_paused()::text || ')'
     else 'Master'
   end as value
 union all

start.psql

@@ -6,15 +6,13 @@
 
 select regexp_replace(version(), '^PostgreSQL (\d+\.\d+).*$', e'\\1')::numeric >= 10 as postgres_dba_pgvers_10plus \gset
 \if :postgres_dba_pgvers_10plus
-  \set funcname_last_wal_receive_lsn pg_last_wal_receive_lsn
-  \set funcname_last_wal_replay_lsn pg_last_wal_replay_lsn
-  \set funcname_is_wal_replay_paused pg_is_wal_replay_paused
-  \echo VERSION 10+++
+  \set postgres_dba_last_wal_receive_lsn pg_last_wal_receive_lsn
+  \set postgres_dba_last_wal_replay_lsn pg_last_wal_replay_lsn
+  \set postgres_dba_is_wal_replay_paused pg_is_wal_replay_paused
 \else
-  \set funcname_last_wal_receive_lsn pg_last_xlog_receive_location
-  \set funcname_last_wal_replay_lsn pg_last_xlog_replay_location
-  \set funcname_is_wal_replay_paused pg_is_xlog_replay_paused
-  \echo VERS < 10 !!
+  \set postgres_dba_last_wal_receive_lsn pg_last_xlog_receive_location
+  \set postgres_dba_last_wal_replay_lsn pg_last_xlog_replay_location
+  \set postgres_dba_is_wal_replay_paused pg_is_xlog_replay_paused
 \endif
 
 -- TODO: improve work with custom GUCs for Postgres 9.5 and older