Rename reserve_pool to reserve_pool_size (#30)

* 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

Author: keithf4

CHANGELOG

@@ -1,3 +1,8 @@
+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
+
+
 v1.3.0
 -- Update to support pgBouncer 1.24
 -- Improved support for newer columns that don't exist in older versions of pgBouncer

pgbouncer_fdw.control

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

sql/functions/pgbouncer_fdw_functions.sql

@@ -422,7 +422,7 @@ CREATE FUNCTION @[email protected]_databases_func() RETURNS TABLE
     , force_user text
     , pool_size int
     , min_pool_size int
-    , reserve_pool int
+    , reserve_pool_size int
     , server_lifetime int
     , pool_mode text
     , load_balance_hosts int
@@ -464,7 +464,7 @@ LOOP BEGIN
                 , x.force_user
                 , x.pool_size
                 , x.min_pool_size
-                , x.reserve_pool
+                , x.reserve_pool_size
                 , x.server_lifetime
                 , x.pool_mode
                 , x.load_balance_hosts
@@ -483,7 +483,7 @@ LOOP BEGIN
                 , force_user text
                 , pool_size int
                 , min_pool_size int
-                , reserve_pool int
+                , reserve_pool_size int
                 , server_lifetime int
                 , pool_mode text
                 , load_balance_hosts int
@@ -504,7 +504,7 @@ LOOP BEGIN
                 , x.force_user
                 , x.pool_size
                 , x.min_pool_size
-                , x.reserve_pool
+                , x.reserve_pool AS reserve_pool_size
                 , x.server_lifetime
                 , x.pool_mode
                 , 0 AS load_balance_hosts
@@ -541,7 +541,7 @@ LOOP BEGIN
                 , x.force_user
                 , x.pool_size
                 , x.min_pool_size
-                , x.reserve_pool
+                , x.reserve_pool AS reserve_pool_size
                 , 0 AS server_lifetime
                 , x.pool_mode
                 , 0 AS load_balance_hosts
@@ -589,7 +589,6 @@ END LOOP;
 END
 $$;
 
-
 /*
  * pgbouncer_dns_hosts_func
  */
@@ -1837,7 +1836,7 @@ CREATE FUNCTION @[email protected]_users_func() RETURNS TABLE
     pgbouncer_target_host text
     , name text
     , pool_size int
-    , reserve_pool_size text
+    , reserve_pool_size int
     , pool_mode text
     , max_user_connections int
     , current_connections int
@@ -1880,7 +1879,7 @@ LOOP BEGIN
             (
                 name text
                 , pool_size int
-                , reserve_pool_size text
+                , reserve_pool_size int
                 , pool_mode text
                 , max_user_connections int
                 , current_connections int
@@ -1892,7 +1891,7 @@ LOOP BEGIN
                 v_row.target_host AS pgbouncer_target_host
                 , x.name
                 , x.pool_size
-                , '' AS reserve_pool_size
+                , 0 AS reserve_pool_size
                 , x.pool_mode
                 , x.max_user_connections
                 , x.current_connections
@@ -1911,7 +1910,7 @@ LOOP BEGIN
                 v_row.target_host AS pgbouncer_target_host
                 , x.name
                 , 0 AS pool_size
-                , '' AS reserve_pool_size
+                , 0 AS reserve_pool_size
                 , x.pool_mode
                 , 0 AS max_user_connections
                 , 0 AS current_connections

sql/views/pgbouncer_fdw_views.sql

@@ -40,7 +40,6 @@ CREATE VIEW @[email protected]_config AS
         , changeable
     FROM @[email protected]_config_func();
 
-
 CREATE VIEW @[email protected]_databases AS
     SELECT pgbouncer_target_host
         , name
@@ -50,7 +49,7 @@ CREATE VIEW @[email protected]_databases AS
         , force_user
         , pool_size
         , min_pool_size
-        , reserve_pool
+        , reserve_pool_size
         , server_lifetime
         , pool_mode
         , load_balance_hosts
@@ -62,7 +61,6 @@ CREATE VIEW @[email protected]_databases AS
         , disabled
      FROM @[email protected]_databases_func();
 
-
 CREATE VIEW @[email protected]_dns_hosts AS
     SELECT pgbouncer_target_host
         , hostname
@@ -203,4 +201,3 @@ CREATE VIEW @[email protected]_users AS
         , max_user_client_connections
         , current_client_connections
      FROM @[email protected]_users_func();
-