Merge pull request #8913 from kenjis/fix-postgre-error-msg

fix: [Postgres] show missing error message
codeigniter4 · May 31, 2024 · 2e70dd8 · 2e70dd8
2 parents d987732 + 8b3e4e3
commit 2e70dd8
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 5 deletions.
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -420,7 +420,12 @@ public function initialize()
             // Connect to the database and set the connection ID
             $this->connID = $this->connect($this->pConnect);
         } catch (Throwable $e) {
-            $connectionErrors[] = sprintf('Main connection [%s]: %s', $this->DBDriver, $e->getMessage());
+            $this->connID       = false;
+            $connectionErrors[] = sprintf(
+                'Main connection [%s]: %s',
+                $this->DBDriver,
+                $e->getMessage()
+            );
             log_message('error', 'Error connecting to the database: ' . $e);
         }
 
@@ -441,7 +446,12 @@ public function initialize()
                         // Try to connect
                         $this->connID = $this->connect($this->pConnect);
                     } catch (Throwable $e) {
-                        $connectionErrors[] = sprintf('Failover #%d [%s]: %s', ++$index, $this->DBDriver, $e->getMessage());
+                        $connectionErrors[] = sprintf(
+                            'Failover #%d [%s]: %s',
+                            ++$index,
+                            $this->DBDriver,
+                            $e->getMessage()
+                        );
                         log_message('error', 'Error connecting to the database: ' . $e);
                     }
 

diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
@@ -78,17 +78,24 @@ public function connect(bool $persistent = false)
         $this->connID = $persistent === true ? pg_pconnect($this->DSN) : pg_connect($this->DSN);
 
         if ($this->connID !== false) {
-            if ($persistent === true && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD && pg_ping($this->connID) === false
+            if (
+                $persistent === true
+                && pg_connection_status($this->connID) === PGSQL_CONNECTION_BAD
+                && pg_ping($this->connID) === false
             ) {
-                return false;
+                $error = pg_last_error($this->connID);
+
+                throw new DatabaseException($error);
             }
 
             if (! empty($this->schema)) {
                 $this->simpleQuery("SET search_path TO {$this->schema},public");
             }
 
             if ($this->setClientEncoding($this->charset) === false) {
-                return false;
+                $error = pg_last_error($this->connID);
+
+                throw new DatabaseException($error);
             }
         }
 

diff --git a/tests/system/Database/Live/Postgre/ConnectTest.php b/tests/system/Database/Live/Postgre/ConnectTest.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <[email protected]>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live\Postgre;
+
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Database;
+use PHPUnit\Framework\Attributes\Group;
+
+/**
+ * @internal
+ */
+#[Group('DatabaseLive')]
+final class ConnectTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = Database::connect($this->DBGroup);
+
+        if ($this->db->DBDriver !== 'Postgre') {
+            $this->markTestSkipped('This test is only for Postgre.');
+        }
+    }
+
+    public function testShowErrorMessageWhenSettingInvalidCharset(): void
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage(
+            'Unable to connect to the database.
+Main connection [Postgre]: ERROR:  invalid value for parameter "client_encoding": "utf8mb4"'
+        );
+
+        $config = config('Database');
+        $group  = $config->tests;
+        // Sets invalid charset.
+        $group['charset'] = 'utf8mb4';
+        $db               = Database::connect($group);
+
+        // Actually connect to DB.
+        $db->initialize();
+    }
+}