wip

Author: michalsn

system/Database/BaseConnection.php

@@ -486,6 +486,20 @@ public function close()
         }
     }
 
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
+     */
+    public function reconnect()
+    {
+        if ($this->ping() === false) {
+            $this->close();
+            $this->initialize();
+        }
+    }
+
     /**
      * Platform dependent way method for closing the connection.
      *

system/Database/MySQLi/Connection.php

@@ -234,20 +234,6 @@ public function connect(bool $persistent = false)
         return false;
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->ping() === false) {
-            $this->close();
-            $this->initialize();
-        }
-    }
-
     /**
      * Close the database connection.
      *

system/Database/OCI8/Connection.php

@@ -150,20 +150,6 @@ public function connect(bool $persistent = false)
             : $func($this->username, $this->password, $this->DSN, $this->charset);
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->ping() === false) {
-            $this->close();
-            $this->initialize();
-        }
-    }
-
     /**
      * Close the database connection.
      *

system/Database/Postgre/Connection.php

@@ -142,20 +142,6 @@ private function convertDSN()
         $this->DSN = $output;
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->ping() === false) {
-            $this->close();
-            $this->initialize();
-        }
-    }
-
     /**
      * Close the database connection.
      *

system/Database/SQLSRV/Connection.php

@@ -166,20 +166,6 @@ public function getAllErrorMessages(): string
         return implode("\n", $errors);
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->ping() === false) {
-            $this->close();
-            $this->initialize();
-        }
-    }
-
     /**
      * Close the database connection.
      *

system/Database/SQLite3/Connection.php

@@ -119,20 +119,6 @@ public function connect(bool $persistent = false)
         }
     }
 
-    /**
-     * Keep or establish the connection if no queries have been sent for
-     * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
-     */
-    public function reconnect()
-    {
-        if ($this->ping() === false) {
-            $this->close();
-            $this->initialize();
-        }
-    }
-
     /**
      * Close the database connection.
      *

tests/system/Database/Live/PingTest.php

@@ -60,7 +60,8 @@ public function testPingAfterReconnect(): void
     public function testPingCanBeUsedToCheckConnectionBeforeQuery(): void
     {
         if ($this->db->ping()) {
-            $result = $this->db->query('SELECT 1');
+            $sql = $this->db->DBDriver === 'OCI8' ? 'SELECT 1 FROM DUAL' : 'SELECT 1';
+            $result = $this->db->query($sql);
             $this->assertNotFalse($result);
         } else {
             $this->fail('Connection should be alive');