From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Wed, 3 Nov 2010 00:37:31 +0000 (-0400)
Subject: Need something that implements the Horde_Db_Adapter interface.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5e28ec6d90a8348c670ecbe7bf5fc7c80e709bad;p=horde.git

Need something that implements the Horde_Db_Adapter interface.

...not necessarily something that extends Horde_Db_Adapter_Base
---

diff --git a/framework/Db/lib/Horde/Db/Migration/Base.php b/framework/Db/lib/Horde/Db/Migration/Base.php
index 11f1bfd13..1d7f5ac81 100644
--- a/framework/Db/lib/Horde/Db/Migration/Base.php
+++ b/framework/Db/lib/Horde/Db/Migration/Base.php
@@ -48,7 +48,7 @@ class Horde_Db_Migration_Base
 
     /**
      */
-    public function __construct(Horde_Db_Adapter_Base $connection, $version = null)
+    public function __construct(Horde_Db_Adapter $connection, $version = null)
     {
         $this->_connection = $connection;
         $this->version = $version;
diff --git a/framework/Db/lib/Horde/Db/Migration/Migrator.php b/framework/Db/lib/Horde/Db/Migration/Migrator.php
index bdcf1a22f..30bf5cb21 100644
--- a/framework/Db/lib/Horde/Db/Migration/Migrator.php
+++ b/framework/Db/lib/Horde/Db/Migration/Migrator.php
@@ -52,7 +52,7 @@ class Horde_Db_Migration_Migrator
      *
      * @throws Horde_Db_Migration_Exception
      */
-    public function __construct(Horde_Db_Adapter_Base $connection,
+    public function __construct(Horde_Db_Adapter $connection,
                                 Horde_Log_Logger $logger = null,
                                 array $options = array())
     {
diff --git a/framework/SQL/SQL.php b/framework/SQL/SQL.php
index 9bedde14a..a44486c75 100644
--- a/framework/SQL/SQL.php
+++ b/framework/SQL/SQL.php
@@ -30,7 +30,7 @@ class Horde_SQL {
      */
     function buildClause($dbh, $lhs, $op, $rhs, $bind = false, $params = array())
     {
-        $type = $dbh instanceof Horde_Db_Adapter_Base ? Horde_String::lower($dbh->adapterName()) : $dbh->phptype;
+        $type = $dbh instanceof Horde_Db_Adapter ? Horde_String::lower($dbh->adapterName()) : $dbh->phptype;
 
         switch ($op) {
         case '|':