Fix empty password in DATABASE_URL by patching postgresql-connection-string

Instead of normalizing the connection string in IHP code, use our upstream
fix for the postgresql-connection-string parser which handles user:@host
(empty password) correctly.

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: mpscholten

NixSupport/overlay.nix

@@ -91,9 +91,11 @@ let
                 url = "https://hackage.haskell.org/package/postgresql-binary-0.15/postgresql-binary-0.15.tar.gz";
                 sha256 = "11ysy91rsvdx9n7cjpyhp23ikv3h9b40k6rdggykhjkdv7vdvhj3";
             }) {}));
+            # Patched to fix parsing of empty password in URI format (user:@host)
+            # See: https://github.com/nikita-volkov/postgresql-connection-string/pull/3
             postgresql-connection-string = fastBuild (self.callCabal2nix "postgresql-connection-string" (builtins.fetchTarball {
-                url = "https://hackage.haskell.org/package/postgresql-connection-string-0.1/postgresql-connection-string-0.1.tar.gz";
-                sha256 = "071m8xzqak2b0l27zplfknsdq8x91k0iwimqikszdvdcj6mp1c6r";
+                url = "https://github.com/mpscholten/postgresql-connection-string/archive/bb9bfb8cfff39e0e87aa24208d0e34a0cefb13cc.tar.gz";
+                sha256 = "1jw3ka11anvx9prr5iliqwi42h5jlwbq8i0xlarzq2hgg3sc0sqp";
             }) {});
 
             hasql = final.haskell.lib.dontCheck (final.haskell.lib.doJailbreak (fastBuild (self.callCabal2nix "hasql" (builtins.fetchTarball {

ihp-datasync/IHP/DataSync/Hasql.hs

@@ -11,7 +11,6 @@ import qualified Hasql.Connection as Hasql
 import qualified Hasql.Connection.Settings as HasqlSettings
 import qualified Hasql.Session as Session
 import qualified Hasql.Errors as Hasql
-import qualified Data.Text as Text
 
 -- | Run a composed Session against the pool. Throws 'Hasql.Pool.UsageError' on failure.
 runSession :: Hasql.Pool.Pool -> Session.Session a -> IO a
@@ -38,13 +37,7 @@ runSessionOnConnection conn session = do
 -- action completes (normally or via exception).
 withDedicatedConnection :: ByteString -> (Hasql.Connection -> IO a) -> IO a
 withDedicatedConnection databaseUrl action = do
-    -- Normalize for hasql's connection string parser:
-    -- 1. postgres:// → postgresql://
-    -- 2. Strip empty password (user:@host) → (user@host) — parser chokes on empty password
-    let hasqlDatabaseUrl = cs databaseUrl
-            |> Text.replace "postgres://" "postgresql://"
-            |> Text.replace ":@" "@"
-    connResult <- Hasql.acquire (HasqlSettings.connectionString hasqlDatabaseUrl)
+    connResult <- Hasql.acquire (HasqlSettings.connectionString (cs databaseUrl))
     case connResult of
         Right conn -> action conn `Exception.finally` Hasql.release conn
         Left err -> error (Hasql.toDetailedText err)

ihp/IHP/ModelSupport.hs

@@ -103,14 +103,8 @@ createModelContext idleTime maxConnections databaseUrl logger = do
     -- HASQL_IDLE_TIME: seconds before idle connection is closed (default: 600 = 10 min)
     hasqlPoolSize :: Maybe Int <- envOrNothing "HASQL_POOL_SIZE"
     hasqlIdleTime :: Maybe Int <- envOrNothing "HASQL_IDLE_TIME"
-    -- Normalize for hasql's connection string parser:
-    -- 1. postgres:// → postgresql://
-    -- 2. Strip empty password (user:@host) → (user@host) — parser chokes on empty password
-    let hasqlDatabaseUrl = cs databaseUrl
-            |> Text.replace "postgres://" "postgresql://"
-            |> Text.replace ":@" "@"
     let hasqlPoolSettings =
-            [ HasqlPoolConfig.staticConnectionSettings (HasqlSettings.connectionString hasqlDatabaseUrl)
+            [ HasqlPoolConfig.staticConnectionSettings (HasqlSettings.connectionString (cs databaseUrl))
             ]
             <> maybe [] (\size -> [HasqlPoolConfig.size size]) hasqlPoolSize
             <> maybe [] (\idle -> [HasqlPoolConfig.idlenessTimeout (fromIntegral idle)]) hasqlIdleTime