fix(db): support libpq keyword/value connection strings

addKeepaliveParams blindly appended `?keepalives=…` to the connection
string, which only works for URI form. With docker-compose's
`DATABASE_URL=host=… sslmode=disable`, the `?` was swallowed by the last
keyword's value, yielding libpq error:
`invalid sslmode value: "disable?keepalives=1&..."`.

Added appendConnParams that detects URI vs keyword/value form and uses
the correct separator (`?`/`&` vs space). Also routed the TimescaleDB
`options` append through it so fresh docker-compose boots work.

Author: tonyalaribe

src/Pkg/DeriveUtils.hs

@@ -12,6 +12,7 @@ module Pkg.DeriveUtils (
   encodeEnumSC,
   WrappedEnumShow (..),
   addKeepaliveParams,
+  appendConnParams,
   connectPostgreSQL,
   idToText,
   idFromText,
@@ -29,6 +30,7 @@ module Pkg.DeriveUtils (
 import Control.Exception (throwIO)
 import Control.Lens ((?~))
 import Data.Aeson qualified as AE
+import Data.ByteString qualified as BS
 import Data.Aeson.KeyMap qualified as KEM
 import Data.Aeson.Types qualified as AET
 import Data.CaseInsensitive (CI, FoldCase)
@@ -319,11 +321,28 @@ data BaselineState = BSLearning | BSEstablished
   deriving (AE.FromJSON, AE.ToJSON, FromField, HI.DecodeValue, HI.EncodeValue, ToField) via WrappedEnumSC "BS" BaselineState
 
 
+-- | Append libpq connection parameters, handling both URI
+-- (@postgres://…?k=v&…@) and keyword/value (@host=… sslmode=…@) forms.
+appendConnParams :: [(ByteString, ByteString)] -> ByteString -> ByteString
+appendConnParams kvs connStr
+  | null kvs = connStr
+  | isUri =
+      let sep = if "?" `T.isInfixOf` decodeUtf8 connStr then "&" else "?"
+       in connStr <> sep <> BS.intercalate "&" [k <> "=" <> v | (k, v) <- kvs]
+  | otherwise = connStr <> " " <> BS.intercalate " " [k <> "=" <> v | (k, v) <- kvs]
+  where
+    txt = decodeUtf8 connStr
+    isUri = "postgres://" `T.isPrefixOf` txt || "postgresql://" `T.isPrefixOf` txt
+
+
 addKeepaliveParams :: ByteString -> ByteString
-addKeepaliveParams connStr =
-  let params = "keepalives=1&keepalives_idle=15&keepalives_interval=10&keepalives_count=3"
-      sep = if T.isInfixOf "?" (decodeUtf8 connStr) then "&" else "?"
-   in connStr <> sep <> params
+addKeepaliveParams =
+  appendConnParams
+    [ ("keepalives", "1")
+    , ("keepalives_idle", "15")
+    , ("keepalives_interval", "10")
+    , ("keepalives_count", "3")
+    ]
 
 
 connectPostgreSQL :: ByteString -> IO Connection

src/System/Config.hs

@@ -253,7 +253,10 @@ configToEnv :: IOE :> es => EnvConfig -> Eff es AuthContext
 configToEnv config = do
   let createPgConnIO = PG.connectPostgreSQL $ DeriveUtils.addKeepaliveParams $ encodeUtf8 config.databaseUrl
       -- Raise TimescaleDB DML decompression limit for UPDATE queries on compressed hypertables
-      tfParams = DeriveUtils.addKeepaliveParams (encodeUtf8 config.timefusionPgUrl) <> "&options=-c%20timescaledb.max_tuples_decompressed_per_dml_transaction%3D0"
+      tfParams =
+        DeriveUtils.appendConnParams
+          [("options", "-c%20timescaledb.max_tuples_decompressed_per_dml_transaction%3D0")]
+          (DeriveUtils.addKeepaliveParams (encodeUtf8 config.timefusionPgUrl))
   let createTimefusionPgConnIO = DeriveUtils.connectPostgreSQL tfParams
   when config.migrateAndInitializeOnStart $ liftIO do
     conn <- createPgConnIO