wip

Author: michalsn

system/Database/Config.php

@@ -167,9 +167,7 @@ public static function validateForWorkerMode(): void
         }
 
         foreach (static::$instances as $connection) {
-            if (! $connection->ping()) {
-                $connection->reconnect();
-            }
+            $connection->reconnect();
         }
     }
 

system/Database/MySQLi/Connection.php

@@ -257,8 +257,10 @@ public function connect(bool $persistent = false)
      */
     public function reconnect()
     {
-        $this->close();
-        $this->initialize();
+        if ($this->ping() === false) {
+            $this->close();
+            $this->initialize();
+        }
     }
 
     /**

system/Database/OCI8/Connection.php

@@ -158,6 +158,10 @@ public function connect(bool $persistent = false)
      */
     public function reconnect()
     {
+        if ($this->ping() === false) {
+            $this->close();
+            $this->initialize();
+        }
     }
 
     /**
@@ -176,6 +180,20 @@ protected function _close()
         oci_close($this->connID);
     }
 
+    /**
+     * Ping the database connection.
+     */
+    protected function _ping(): bool
+    {
+        try {
+            $result = $this->simpleQuery('SELECT 1 FROM DUAL');
+
+            return $result !== false;
+        } catch (DatabaseException) {
+            return false;
+        }
+    }
+
     /**
      * Select a specific database table to use.
      */

system/Database/Postgre/Connection.php

@@ -150,7 +150,7 @@ private function convertDSN()
      */
     public function reconnect()
     {
-        if ($this->connID === false || pg_ping($this->connID) === false) {
+        if ($this->ping() === false) {
             $this->close();
             $this->initialize();
         }

system/Database/SQLSRV/Connection.php

@@ -174,8 +174,10 @@ public function getAllErrorMessages(): string
      */
     public function reconnect()
     {
-        $this->close();
-        $this->initialize();
+        if ($this->ping() === false) {
+            $this->close();
+            $this->initialize();
+        }
     }
 
     /**

system/Database/SQLite3/Connection.php

@@ -127,8 +127,10 @@ public function connect(bool $persistent = false)
      */
     public function reconnect()
     {
-        $this->close();
-        $this->initialize();
+        if ($this->ping() === false) {
+            $this->close();
+            $this->initialize();
+        }
     }
 
     /**

user_guide_src/source/changelogs/v4.7.0.rst

@@ -289,7 +289,8 @@ Testing
 Database
 ========
 
-- **BaseConnection:** Added ``ping()`` method to check if the database connection is still alive. Postgre uses native ``pg_ping()``, other drivers use ``SELECT 1``.
+- **BaseConnection:** Added ``ping()`` method to check if the database connection is still alive. OCI8 uses ``SELECT 1 FROM DUAL``, other drivers use ``SELECT 1``.
+- **BaseConnection:** The ``reconnect()`` method now uses ``ping()`` to check if the connection is alive before reconnecting. Previously, some drivers would always close and reconnect unconditionally, and OCI8's ``reconnect()`` did nothing.
 - **Exception Logging:** All DB drivers now log database exceptions uniformly. Previously, each driver had its own log format.
 
 Query Builder

user_guide_src/source/database/connecting.rst

@@ -94,12 +94,12 @@ Reconnecting / Keeping the Connection Alive
 
 If the database server's idle timeout is exceeded while you're doing
 some heavy PHP lifting (processing an image, for instance), you should
-consider pinging the server by using the ``reconnect()`` method before
-sending further queries, which can gracefully keep the connection alive
-or re-establish it.
+consider calling the ``reconnect()`` method before sending further queries,
+which can gracefully keep the connection alive or re-establish it.
 
-.. important:: If you are using MySQLi database driver, the ``reconnect()`` method
-    does not ping the server but it closes the connection then connects again.
+The ``reconnect()`` method pings the server to check if the connection is still
+alive. If the connection has been lost, it will close and re-establish the
+connection.
 
 .. literalinclude:: connecting/007.php
     :lines: 2-