From 1badcf16a092ac1c95536d1e6d0e529d369cdc5e Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Tue, 12 May 2009 23:58:07 +0200 Subject: [PATCH] Add Horde_Db_Adapter_Abstract_Table::getColumn() to return a single column definition. --- framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php | 8 ++++++++ framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php b/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php index 79ae49a15..177c35810 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php +++ b/framework/Db/lib/Horde/Db/Adapter/Abstract/Table.php @@ -76,6 +76,14 @@ class Horde_Db_Adapter_Abstract_Table } /** + * @return Horde_Db_Adapter_Abstract_Column + */ + public function getColumn($column) + { + return isset($this->_columns[$column]) ? $this->_columns[$column] : null; + } + + /** * @return array */ public function getColumnNames() diff --git a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php index 03178dd97..358068475 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php @@ -266,7 +266,7 @@ class Horde_Db_Adapter_Mysql_Schema extends Horde_Db_Adapter_Abstract_Schema // create columns from rows $columns = array(); foreach ($rows as $row) { - $columns[] = $this->componentFactory('Column', array( + $columns[$row['Field']] = $this->componentFactory('Column', array( $row['Field'], $row['Default'], $row['Type'], $row['Null'] == 'YES')); } diff --git a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php index 4d8d3da87..063d6ce48 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php @@ -273,7 +273,7 @@ class Horde_Db_Adapter_Postgresql_Schema extends Horde_Db_Adapter_Abstract_Schem // create columns from rows $columns = array(); foreach ($rows as $row) { - $columns[] = $this->componentFactory('Column', array( + $columns[$row[0]] = $this->componentFactory('Column', array( $row[0], $row[2], $row[1], !(boolean)$row[3])); } return $columns; diff --git a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php index a0920174c..5442efe16 100644 --- a/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php +++ b/framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php @@ -198,7 +198,7 @@ class Horde_Db_Adapter_Sqlite_Schema extends Horde_Db_Adapter_Abstract_Schema // create columns from rows $columns = array(); foreach ($rows as $row) { - $columns[] = $this->componentFactory('Column', array( + $columns[$row[1]] = $this->componentFactory('Column', array( $row[1], $row[4], $row[2], !(bool)$row[3])); } -- 2.11.0