[FIX] PostgreSQL support.

Seiger · Seiger · commit def4e66e3563 · 2026-01-15T22:36:34.000+02:00
diff --git a/internal/engine/install/engine.go b/internal/engine/install/engine.go
@@ -1774,15 +1774,46 @@ try {
     new \PDO("sqlite:".$name, null, null, $timeout);
     echo json_encode(["ok"=>true]); exit(0);
   }
+  if ($type === "pgsql") {
+    $maintenanceOk = false;
+    $maintenanceErr = null;
+    foreach (["postgres", "template1"] as $db) {
+      try {
+        $dsnMaint = $port > 0 ? "pgsql:host={$host};port={$port};dbname={$db}" : "pgsql:host={$host};dbname={$db}";
+        new \PDO($dsnMaint, $user, $pass, $timeout);
+        $maintenanceOk = true;
+        break;
+      } catch (\Throwable $e) {
+        $maintenanceErr = $e;
+      }
+    }
+
+    $targetOk = false;
+    $targetErr = null;
+    if ($name !== "") {
+      try {
+        $dsn = $port > 0 ? "pgsql:host={$host};port={$port};dbname={$name}" : "pgsql:host={$host};dbname={$name}";
+        new \PDO($dsn, $user, $pass, $timeout);
+        $targetOk = true;
+      } catch (\Throwable $e) {
+        $targetErr = $e;
+      }
+    }
+
+    if (!$maintenanceOk && !$targetOk) {
+      throw $targetErr ?? $maintenanceErr ?? new \Exception("PostgreSQL connection failed.");
+    }
+
+    echo json_encode(["ok"=>true]); exit(0);
+  }
+
   $dsnNoDb = match($type) {
-    "pgsql" => $port > 0 ? "pgsql:host={$host};port={$port};dbname=postgres" : "pgsql:host={$host};dbname=postgres",
     "sqlsrv" => $port > 0 ? "sqlsrv:Server={$host},{$port}" : "sqlsrv:Server={$host}",
     default => "mysql:host={$host};port={$port};charset=utf8mb4",
   };
   new \PDO($dsnNoDb, $user, $pass, $timeout);
   if ($name !== "") {
     $dsn = match($type) {
-      "pgsql" => "pgsql:host={$host};port={$port};dbname={$name}",
       "sqlsrv" => ($port > 0 ? "sqlsrv:Server={$host},{$port};Database={$name}" : "sqlsrv:Server={$host};Database={$name}"),
       default => "mysql:host={$host};port={$port};dbname={$name};charset=utf8mb4",
     };
diff --git a/internal/engine/install/engine_test.go b/internal/engine/install/engine_test.go
@@ -65,7 +65,7 @@ func TestCmpSemver(t *testing.T) {
 func TestDbConnectionTestScriptUsesPostgresMaintenanceDb(t *testing.T) {
 	t.Parallel()
 
-	if !strings.Contains(dbConnectionTestScript, "dbname=postgres") {
-		t.Fatalf("dbConnectionTestScript does not contain PostgreSQL maintenance dbname")
+	if !strings.Contains(dbConnectionTestScript, `"postgres"`) || !strings.Contains(dbConnectionTestScript, `"template1"`) {
+		t.Fatalf("dbConnectionTestScript does not include expected PostgreSQL maintenance database candidates")
 	}
 }
diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -474,15 +474,37 @@ protected function testDatabaseConnection(array $config): bool
                     return false;
                 }
                 $this->createConnection($config);
+            } elseif ($type === 'pgsql') {
+                // PostgreSQL requires a database name; otherwise it defaults to using the username.
+                // To support environments where `postgres` is missing/restricted, accept either:
+                // - successful connect to a maintenance DB (postgres/template1), or
+                // - successful connect to the target DB (if only that one is accessible).
+                $maintenanceOk = false;
+                $maintenanceErr = null;
+
+                $configForOps = $config;
+                unset($configForOps['name']);
+                $dbh = $this->createPostgresMaintenanceConnection($configForOps, $maintenanceErr);
+                $maintenanceOk = $dbh !== null;
+
+                $targetOk = false;
+                $targetErr = null;
+                if (!empty($config['name'])) {
+                    try {
+                        $this->createConnection($config, true);
+                        $targetOk = true;
+                    } catch (PDOException $e) {
+                        $targetErr = $e;
+                    }
+                }
+
+                if (!$maintenanceOk && !$targetOk) {
+                    throw $targetErr ?? $maintenanceErr ?? new PDOException('PostgreSQL connection failed.');
+                }
             } else {
                 // For server-based databases, try to connect without database name first
                 $configWithoutDb = $config;
                 unset($configWithoutDb['name']);
-                if ($type === 'pgsql') {
-                    // PostgreSQL requires a database name; otherwise it defaults to using the username.
-                    // Use a maintenance database for credential/host validation.
-                    $configWithoutDb['name'] = 'postgres';
-                }
                 $this->createConnection($configWithoutDb);
 
                 // If database name is provided, try to connect to it
@@ -528,6 +550,7 @@ protected function askRetryDatabaseConnection(): bool
     {
         $options = ['Exit installation', 'Try again'];
         $active = 0;
+        $buffer = '';
 
         // Display question in cyan without icon
         $this->tui->addLog('Would you like to try again or exit installation?', 'ask');
@@ -540,31 +563,42 @@ protected function askRetryDatabaseConnection(): bool
         $this->setSttyMode('-icanon -echo');
         try {
             while (true) {
-                $key = fread(STDIN, 3);
-                if ($key === '' || $key === false) {
+                $chunk = fread(STDIN, 3);
+                if ($chunk === '' || $chunk === false) {
                     usleep(20000);
                     continue;
                 }
 
-                switch ($key) {
+                $buffer .= $chunk;
+                if (strlen($buffer) > 3) {
+                    $buffer = substr($buffer, -3);
+                }
+
+                $prevActive = $active;
+                switch ($buffer) {
                     case "\033[D": // ←
                     case "\033[A": // ↑
                         $active = max(0, $active - 1);
+                        $buffer = '';
                         break;
 
                     case "\033[C": // →
                     case "\033[B": // ↓
                         $active = min(count($options) - 1, $active + 1);
+                        $buffer = '';
                         break;
 
                     case "\n": // Enter
+                    case "\r": // Enter (some terminals)
                         $active
                             ? $this->tui->replaceLastLogs('Reinput DB connections.', 2)
                             : $this->tui->replaceLastLogs('Exit ...', 3);
                         return $active;
                 }
 
-                $this->tui->replaceLastLog($this->tui->renderRadio($options, $active));
+                if ($active !== $prevActive) {
+                    $this->tui->replaceLastLog($this->tui->renderRadio($options, $active));
+                }
             }
         } finally {
             $this->setSttyMode('sane');
diff --git a/src/Concerns/ConfiguresDatabase.php b/src/Concerns/ConfiguresDatabase.php
@@ -12,9 +12,10 @@ trait ConfiguresDatabase
      * Create database connection.
      *
      * @param array $config
+     * @param bool $quiet
      * @return PDO
      */
-    protected function createConnection(array $config): PDO
+    protected function createConnection(array $config, bool $quiet = false): PDO
     {
         $type = $config['type'];
         $host = $config['host'] ?? '';
@@ -39,11 +40,35 @@ protected function createConnection(array $config): PDO
 
             return $dbh;
         } catch (PDOException $e) {
-            Console::error("Database connection failed: " . $e->getMessage());
+            if (!$quiet) {
+                Console::error("Database connection failed: " . $e->getMessage());
+            }
             throw $e;
         }
     }
 
+    /**
+     * Try to connect to a PostgreSQL maintenance database.
+     *
+     * Some environments remove/restrict access to the default `postgres` DB.
+     * `template1` is expected to exist on all PostgreSQL instances.
+     */
+    protected function createPostgresMaintenanceConnection(array $config, ?PDOException &$lastError = null): ?PDO
+    {
+        $candidates = ['postgres', 'template1'];
+        foreach ($candidates as $dbName) {
+            $cfg = $config;
+            $cfg['name'] = $dbName;
+            try {
+                $lastError = null;
+                return $this->createConnection($cfg, true);
+            } catch (PDOException $e) {
+                $lastError = $e;
+            }
+        }
+        return null;
+    }
+
     /**
      * Build DSN string.
      *
@@ -183,14 +208,17 @@ protected function createDatabase(array $config, string $collation): bool
         // MySQL / PostgreSQL
         $configWithoutDb = $config;
         unset($configWithoutDb['name']);
-        if ($type === 'pgsql') {
-            // PostgreSQL requires a database name; otherwise it defaults to using the username.
-            // Use a maintenance database for CREATE DATABASE operations.
-            $configWithoutDb['name'] = 'postgres';
-        }
 
         try {
-            $dbh = $this->createConnection($configWithoutDb);
+            if ($type === 'pgsql') {
+                $last = null;
+                $dbh = $this->createPostgresMaintenanceConnection($configWithoutDb, $last);
+                if (!$dbh) {
+                    throw $last ?? new PDOException('Unable to connect to PostgreSQL maintenance database.');
+                }
+            } else {
+                $dbh = $this->createConnection($configWithoutDb);
+            }
             $charset = $this->getCharsetFromCollation($collation);
 
             if ($type === 'pgsql') {
diff --git a/src/Presets/EvolutionPreset.php b/src/Presets/EvolutionPreset.php
@@ -126,9 +126,19 @@ protected function setupDatabase(string $name, array $options): void
         // Test connection first (without database)
         $dbConfigWithoutDb = $dbConfig;
         unset($dbConfigWithoutDb['name']);
-        
-        if (!$this->testConnection($dbConfigWithoutDb)) {
-            throw new \RuntimeException("Cannot connect to database server. Please check your credentials.");
+        $dbh = null;
+        if (($dbConfigWithoutDb['type'] ?? '') === 'pgsql') {
+            $last = null;
+            $dbh = $this->createPostgresMaintenanceConnection($dbConfigWithoutDb, $last);
+            if (!$dbh) {
+                $msg = $last ? $last->getMessage() : 'Cannot connect to PostgreSQL maintenance database.';
+                throw new \RuntimeException("Cannot connect to database server. {$msg}");
+            }
+        } else {
+            if (!$this->testConnection($dbConfigWithoutDb)) {
+                throw new \RuntimeException("Cannot connect to database server. Please check your credentials.");
+            }
+            $dbh = $this->createConnection($dbConfigWithoutDb);
         }
 
         // Create database if needed
@@ -137,7 +147,6 @@ protected function setupDatabase(string $name, array $options): void
         }
 
         // Resolve collation before creating database
-        $dbh = $this->createConnection($dbConfigWithoutDb);
         $serverVersion = null;
         if ($dbConfig['type'] === 'mysql') {
             try {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func TestCmpSemver(t *testing.T) {`
`65`	`65`	`func TestDbConnectionTestScriptUsesPostgresMaintenanceDb(t *testing.T) {`
`66`	`66`	`t.Parallel()`
`67`	`67`
`68`		`- if !strings.Contains(dbConnectionTestScript, "dbname=postgres") {`
`69`		`- t.Fatalf("dbConnectionTestScript does not contain PostgreSQL maintenance dbname")`
	`68`	+ if !strings.Contains(dbConnectionTestScript, `"postgres"`) \|\| !strings.Contains(dbConnectionTestScript, `"template1"`) {
	`69`	`+ t.Fatalf("dbConnectionTestScript does not include expected PostgreSQL maintenance database candidates")`
`70`	`70`	`}`
`71`	`71`	`}`