Fix pool_size data type in users function (#31)

* fix: fix pgbouncer_server view missing column

* chore: update changelog

* fix: fix pgbouncer_dns_zones view missing column

* fix: change column name reserve_pool to reserve_pool_size for show databases

* fix reserve_pool_size datatype in users

* fix: fix pool_size data type in users

Author: keithf4

CHANGELOG

@@ -1,6 +1,6 @@
 v1.4.0
 -- Update to support column change in databases from reserve_pool to reserve_pool_size in pgBouncer 1.24
--- Set proper data type for reserve_pool_size in users
+-- Set proper data type for pool_size and reserve_pool_size in users
 
 
 v1.3.0

sql/functions/pgbouncer_fdw_functions.sql

@@ -1835,8 +1835,8 @@ CREATE FUNCTION @extschema@.pgbouncer_users_func() RETURNS TABLE
 (
     pgbouncer_target_host text
     , name text
-    , pool_size int
-    , reserve_pool_size int
+    , pool_size text
+    , reserve_pool_size text
     , pool_mode text
     , max_user_connections int
     , current_connections int
@@ -1878,8 +1878,8 @@ LOOP BEGIN
             FROM dblink(v_row.target_host, 'show users') AS x
             (
                 name text
-                , pool_size int
-                , reserve_pool_size int
+                , pool_size text
+                , reserve_pool_size text
                 , pool_mode text
                 , max_user_connections int
                 , current_connections int
@@ -1895,12 +1895,12 @@ LOOP BEGIN
                 , x.pool_mode
                 , x.max_user_connections
                 , x.current_connections
-                , 0 AS max_user_client_connections 
+                , 0 AS max_user_client_connections
                 , 0 AS current_client_connections
             FROM dblink(v_row.target_host, 'show users') AS x
             (
                 name text
-                , pool_size int
+                , pool_size text
                 , pool_mode text
                 , max_user_connections int
                 , current_connections int
@@ -1909,12 +1909,12 @@ LOOP BEGIN
             RETURN QUERY SELECT
                 v_row.target_host AS pgbouncer_target_host
                 , x.name
-                , 0 AS pool_size
-                , 0 AS reserve_pool_size
+                , '' AS pool_size
+                , '' AS reserve_pool_size
                 , x.pool_mode
                 , 0 AS max_user_connections
                 , 0 AS current_connections
-                , 0 AS max_user_client_connections 
+                , 0 AS max_user_client_connections
                 , 0 AS current_client_connections
             FROM dblink(v_row.target_host, 'show users') AS x
             (
@@ -1944,7 +1944,6 @@ $$;
 
 
 
-
 /**** ADMIN FUNCTIONS ****/
 
 CREATE FUNCTION @extschema@.pgbouncer_command_disable(p_dbname text, p_pgbouncer_target_host text DEFAULT 'pgbouncer') RETURNS void

updates/pgbouncer_fdw--1.3.0--1.4.0.sql

@@ -32,7 +32,6 @@ AND table_name = 'pgbouncer_users'
 AND grantee != 'PUBLIC'
 GROUP BY grantee;
 
-
 DROP VIEW @extschema@.pgbouncer_databases;
 DROP VIEW @extschema@.pgbouncer_users;
 
@@ -243,8 +242,8 @@ CREATE FUNCTION @extschema@.pgbouncer_users_func() RETURNS TABLE
 (
     pgbouncer_target_host text
     , name text
-    , pool_size int
-    , reserve_pool_size int
+    , pool_size text
+    , reserve_pool_size text
     , pool_mode text
     , max_user_connections int
     , current_connections int
@@ -286,8 +285,8 @@ LOOP BEGIN
             FROM dblink(v_row.target_host, 'show users') AS x
             (
                 name text
-                , pool_size int
-                , reserve_pool_size int
+                , pool_size text
+                , reserve_pool_size text
                 , pool_mode text
                 , max_user_connections int
                 , current_connections int
@@ -299,7 +298,7 @@ LOOP BEGIN
                 v_row.target_host AS pgbouncer_target_host
                 , x.name
                 , x.pool_size
-                , 0 AS reserve_pool_size
+                , '' AS reserve_pool_size
                 , x.pool_mode
                 , x.max_user_connections
                 , x.current_connections
@@ -308,7 +307,7 @@ LOOP BEGIN
             FROM dblink(v_row.target_host, 'show users') AS x
             (
                 name text
-                , pool_size int
+                , pool_size text
                 , pool_mode text
                 , max_user_connections int
                 , current_connections int
@@ -317,8 +316,8 @@ LOOP BEGIN
             RETURN QUERY SELECT
                 v_row.target_host AS pgbouncer_target_host
                 , x.name
-                , 0 AS pool_size
-                , 0 AS reserve_pool_size
+                , '' AS pool_size
+                , '' AS reserve_pool_size
                 , x.pool_mode
                 , 0 AS max_user_connections
                 , 0 AS current_connections