From: Jan Schneider <jan@horde.org>
Date: Fri, 15 Oct 2010 12:28:53 +0000 (+0200)
Subject: Hotfix to support Horde_Db until we have ported this stuff to there. Blob
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=71dd090f3dad2f8eb5b8f09718a7ddad2d78d906;p=horde.git

Hotfix to support Horde_Db until we have ported this stuff to there. Blob
handling is still broken.
---

diff --git a/framework/SQL/SQL.php b/framework/SQL/SQL.php
index 8635aecb7..9bedde14a 100644
--- a/framework/SQL/SQL.php
+++ b/framework/SQL/SQL.php
@@ -30,11 +30,14 @@ 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;
+
         switch ($op) {
         case '|':
         case '&':
-            switch ($dbh->phptype) {
+            switch ($type) {
             case 'pgsql':
+            case 'pdo_postgresql':
                 // Only PgSQL 7.3+ understands SQL99 'SIMILAR TO'; use
                 // ~ for greater backwards compatibility.
                 $query = 'CASE WHEN CAST(%s AS VARCHAR) ~ \'^-?[0-9]+$\' THEN (CAST(%s AS INTEGER) %s %s) <> 0 ELSE FALSE END';
@@ -94,7 +97,7 @@ class Horde_SQL {
             }
 
         case '~':
-            if ($dbh->phptype == 'mysql') {
+            if ($type == 'mysql' || $type == 'mysqli' || $type == 'pdo_mysql') {
                 $op = 'REGEXP';
             }
             if ($bind) {
@@ -130,7 +133,7 @@ class Horde_SQL {
             }
 
         case 'LIKE':
-            if ($dbh->phptype == 'pgsql') {
+            if ($type == 'pgsql' || $type == 'pdo_pgsql') {
                 $query = '%s ILIKE %s';
             } else {
                 $query = 'LOWER(%s) LIKE LOWER(%s)';