From 009250006ebc8cf67c485c88dbea6ac32be9dfe2 Mon Sep 17 00:00:00 2001
From: steve-chavez <stevechavezast@gmail.com>
Date: Mon, 22 May 2023 14:31:18 -0300
Subject: [PATCH] feat: add db-pool-timeout alias

For db-pool-max-idletime
---
 CHANGELOG.md                            | 4 ++--
 src/PostgREST/Config.hs                 | 3 ++-
 test/io/configs/aliases.config          | 1 +
 test/io/configs/expected/aliases.config | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a318b21e8..392e6bc50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
  - #2786, Limit idle postgresql connection lifetime - @robx
    + New option `db-pool-max-idletime` (default 30s).
-   + This is equivalent to the old option `db-pool-timeout`
-     of PostgREST 10.0.0.
+   + This is equivalent to the old option `db-pool-timeout` of PostgREST 10.0.0.
+   + A config alias for `db-pool-timeout` is included.
 
 ## [11.0.1] - 2023-04-27
 
diff --git a/src/PostgREST/Config.hs b/src/PostgREST/Config.hs
index 438dc6c44..e3e102050 100644
--- a/src/PostgREST/Config.hs
+++ b/src/PostgREST/Config.hs
@@ -230,7 +230,8 @@ parser optPath env dbSettings roleSettings =
     <*> (fromMaybe 10 <$> optInt "db-pool")
     <*> (fromMaybe 10 <$> optInt "db-pool-acquisition-timeout")
     <*> (fromMaybe 1800 <$> optInt "db-pool-max-lifetime")
-    <*> (fromMaybe 30 <$> optInt "db-pool-max-idletime")
+    <*> (fromMaybe 30 <$> optWithAlias (optInt "db-pool-timeout")
+                                       (optInt "db-pool-max-idletime"))
     <*> (fmap toQi <$> optWithAlias (optString "db-pre-request")
                                     (optString "pre-request"))
     <*> (fromMaybe True <$> optBool "db-prepared-statements")
diff --git a/test/io/configs/aliases.config b/test/io/configs/aliases.config
index 6a9482e87..cd66cc299 100644
--- a/test/io/configs/aliases.config
+++ b/test/io/configs/aliases.config
@@ -1,4 +1,5 @@
 db-schema = "provided_through_alias"
+db-pool-timeout = 5
 max-rows = 1000
 pre-request = "check_alias"
 role-claim-key = ".aliased"
diff --git a/test/io/configs/expected/aliases.config b/test/io/configs/expected/aliases.config
index be9e428eb..06c03eef6 100644
--- a/test/io/configs/expected/aliases.config
+++ b/test/io/configs/expected/aliases.config
@@ -7,7 +7,7 @@ db-plan-enabled = false
 db-pool = 10
 db-pool-acquisition-timeout = 10
 db-pool-max-lifetime = 1800
-db-pool-max-idletime = 30
+db-pool-max-idletime = 5
 db-pre-request = "check_alias"
 db-prepared-statements = true
 db-root-spec = "open_alias"