fix: fix pgbouncer_server view missing column (#16)

* fix: fix pgbouncer_server view missing column

* chore: update changelog

* fix: fix pgbouncer_dns_zones view missing column

Author: keithf4

CHANGELOG

@@ -1,3 +1,7 @@
+v1.0.1
+-- Fix missing comma that caused missing column "pgbouncer_target_host" in "pgbouncer_servers" and "pgbouncer_dns_zones" views
+
+
 v1.0.0
 -- IMPORTANT NOTE: All objects in this extension are dropped and recreated as part of this update. Privileges ARE NOT preserved as part of this update, so please ensure privileges you have on these objects are preserved before upgrading so that they can be reapplied. Note that execution by PUBLIC on the admin functions is once again revoked by this update.
 

pgbouncer_fdw.control

@@ -1,4 +1,4 @@
-default_version = '1.0.0'
+default_version = '1.0.1'
 comment = 'Extension for querying PgBouncer stats from normal SQL views & running pgbouncer commands from normal SQL functions'
 requires = dblink
 relocatable = false

sql/views/pgbouncer_fdw_views.sql

@@ -66,7 +66,7 @@ CREATE VIEW @extschema@.pgbouncer_dns_hosts AS
 
 CREATE VIEW @extschema@.pgbouncer_dns_zones AS
     SELECT pgbouncer_target_host
-        zonename
+        , zonename
         , serial
         , count
      FROM @extschema@.pgbouncer_dns_zones_func();
@@ -102,7 +102,7 @@ CREATE VIEW @extschema@.pgbouncer_pools AS
 
 CREATE VIEW @extschema@.pgbouncer_servers AS
     SELECT pgbouncer_target_host
-        "type"
+        , "type"
         , "user"
         , database
         , state
@@ -178,5 +178,3 @@ CREATE VIEW @extschema@.pgbouncer_users AS
         , name
         , pool_mode
      FROM @extschema@.pgbouncer_users_func();
-
-

updates/pgbouncer_fdw--1.0.0--1.0.1.sql

@@ -0,0 +1,65 @@
+-- Fix missing comma that caused missing column "pgbouncer_target_host" in "pgbouncer_servers" and "pgbouncer_dns_zones" views
+
+CREATE TEMP TABLE pgbouncer_fdw_preserve_privs_temp (statement text);
+
+INSERT INTO pgbouncer_fdw_preserve_privs_temp
+SELECT 'GRANT '||string_agg(privilege_type, ',')||' ON @extschema@.pgbouncer_servers TO '||grantee::text||';'
+FROM information_schema.table_privileges
+WHERE table_schema = '@extschema@'
+AND table_name = 'pgbouncer_servers'
+GROUP BY grantee;
+
+INSERT INTO pgbouncer_fdw_preserve_privs_temp
+SELECT 'GRANT '||string_agg(privilege_type, ',')||' ON @extschema@.pgbouncer_dns_zones TO '||grantee::text||';'
+FROM information_schema.table_privileges
+WHERE table_schema = '@extschema@'
+AND table_name = 'pgbouncer_dns_zones'
+GROUP BY grantee;
+
+DROP VIEW @extschema@.pgbouncer_servers;
+DROP VIEW @extschema@.pgbouncer_dns_zones;
+
+CREATE OR REPLACE VIEW @extschema@.pgbouncer_servers AS
+    SELECT pgbouncer_target_host
+        , "type"
+        , "user"
+        , database
+        , state
+        , addr
+        , port
+        , local_addr
+        , local_port
+        , connect_time
+        , request_time
+        , wait
+        , wait_us
+        , close_needed
+        , ptr
+        , link
+        , remote_pid
+        , tls
+        , application_name
+     FROM @extschema@.pgbouncer_servers_func();
+
+
+CREATE VIEW @extschema@.pgbouncer_dns_zones AS
+    SELECT pgbouncer_target_host
+        , zonename
+        , serial
+        , count
+     FROM @extschema@.pgbouncer_dns_zones_func();
+
+-- Restore dropped object privileges
+DO $$
+DECLARE
+v_row   record;
+BEGIN
+    FOR v_row IN SELECT statement FROM pgbouncer_fdw_preserve_privs_temp LOOP
+        IF v_row.statement IS NOT NULL THEN
+            EXECUTE v_row.statement;
+        END IF;
+    END LOOP;
+END
+$$;
+
+DROP TABLE IF EXISTS pgbouncer_fdw_preserve_privs_temp;