Don't run connect() if we already have active connection

diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php
index ccaece8..cba44d1 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Mysqli.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Mysqli.php
@@ -112,6 +112,10 @@ class Horde_Db_Adapter_Mysqli extends Horde_Db_Adapter_Base
      */
     public function connect()
     {
+        if ($this->_active) {
+            return;
+        }
+
         $config = $this->_parseConfig();
 
         if (!empty($config['ssl'])) {

diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php
index 6169982..bd57ba2 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Pdo/Base.php
@@ -32,6 +32,10 @@ abstract class Horde_Db_Adapter_Pdo_Base extends Horde_Db_Adapter_Base
      */
     public function connect()
     {
+        if ($this->_active) {
+            return;
+        }
+
         list($dsn, $user, $pass) = $this->_parseConfig();
 
         $oldErrorReporting = error_reporting(0);
@@ -59,7 +63,8 @@ abstract class Horde_Db_Adapter_Pdo_Base extends Horde_Db_Adapter_Base
      */
     public function isActive()
     {
-       return isset($this->_connection) && $this->_connection->query('SELECT 1');
+        return isset($this->_connection) &&
+               $this->_connection->query('SELECT 1');
     }
 
 

diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php
index 5a260a7..256b980 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Pdo/Mysql.php
@@ -56,6 +56,10 @@ class Horde_Db_Adapter_Pdo_Mysql extends Horde_Db_Adapter_Pdo_Base
      */
     public function connect()
     {
+        if ($this->_active) {
+            return;
+        }
+
         parent::connect();
 
         // ? $this->_connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);

diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php
index 32e669a..07779be 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Pdo/Pgsql.php
@@ -75,10 +75,16 @@ class Horde_Db_Adapter_Pdo_Pgsql extends Horde_Db_Adapter_Pdo_Base
     ##########################################################################*/
 
     /**
-     * Connect to the db
+     * Connect to the db.
+     *
+     * @throws Horde_Db_Exception
      */
     public function connect()
     {
+        if ($this->_active) {
+            return;
+        }
+
         parent::connect();
 
         $retval = $this->_connection->exec("SET datestyle TO 'iso'");

diff --git a/framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php b/framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php
index 4276b18..d86422b 100644 (file)
--- a/framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Pdo/Sqlite.php
@@ -74,10 +74,16 @@ class Horde_Db_Adapter_Pdo_Sqlite extends Horde_Db_Adapter_Pdo_Base
     ##########################################################################*/
 
     /**
-     * Connect to the db
+     * Connect to the db.
+     *
+     * @throws Horde_Db_Exception
      */
     public function connect()
     {
+        if ($this->_active) {
+            return;
+        }
+
         parent::connect();
 
         $this->_connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);