From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Thu, 4 Nov 2010 05:08:05 +0000 (-0400)
Subject: another place to use column names, not numeric offsets
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7aaf4831befa9ef15a7d25c15eb3cb007842c8ae;p=horde.git

another place to use column names, not numeric offsets
---

diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
index ae69e8efc..0b18c31c6 100644
--- a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php
@@ -390,8 +390,8 @@ class Horde_Db_Adapter_Mysql_Schema extends Horde_Db_Adapter_Base_Schema
     public function showVariable($name)
     {
         $value = $this->selectOne('SHOW VARIABLES LIKE '.$this->quoteString($name));
-        if ($value[0] == $name) {
-            return $value[1];
+        if ($value['Variable_name'] == $name) {
+            return $value['Value'];
         } else {
             throw new Horde_Db_Exception($name . ' is not a recognized variable');
         }
diff --git a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php
index 7126e6421..ce862ebb1 100644
--- a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php
+++ b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php
@@ -260,12 +260,12 @@ class Horde_Db_Adapter_Postgresql_Schema extends Horde_Db_Adapter_Base_Schema
             $indexes = array();
 
             foreach ($result as $row) {
-                if ($currentIndex != $row[0]) {
-                    $currentIndex = $row[0];
+                if ($currentIndex != $row['relname']) {
+                    $currentIndex = $row['relname'];
                     $indexes[] = $this->makeIndex(
-                        $tableName, $row[0], false, $row[1] == 't', array());
+                        $tableName, $row['relname'], false, $row['indisunique'] == 't', array());
                 }
-                $indexes[count($indexes) - 1]->columns[] = $row[2];
+                $indexes[count($indexes) - 1]->columns[] = $row['attname'];
             }
 
             $this->_cache->set("tables/indexes/$tableName", serialize($indexes));
@@ -433,7 +433,7 @@ class Horde_Db_Adapter_Postgresql_Schema extends Horde_Db_Adapter_Base_Schema
         }
 
         // [primary_key, sequence]
-        return array($result[0], $result[1]);
+        return array($result['attname'], $result['relname']);
     }
 
     /**