From 746a553419cb0738ac25ce5262c67c6de2f73fee Mon Sep 17 00:00:00 2001 From: David Grudl Date: Tue, 3 Aug 2010 23:33:12 +0200 Subject: [PATCH] IDibiDriver::getColumnsMeta() renamed to getResultColumns() (BC break!) --- dibi/drivers/firebird.php | 2 +- dibi/drivers/mssql.php | 2 +- dibi/drivers/mssql2005.php | 2 +- dibi/drivers/mysql.php | 2 +- dibi/drivers/mysqli.php | 2 +- dibi/drivers/odbc.php | 2 +- dibi/drivers/oracle.php | 2 +- dibi/drivers/pdo.php | 2 +- dibi/drivers/postgre.php | 2 +- dibi/drivers/sqlite.php | 2 +- dibi/drivers/sqlite3.php | 2 +- dibi/libs/DibiDatabaseInfo.php | 2 +- dibi/libs/interfaces.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dibi/drivers/firebird.php b/dibi/drivers/firebird.php index 1d887f0d..2c9440dd 100644 --- a/dibi/drivers/firebird.php +++ b/dibi/drivers/firebird.php @@ -393,7 +393,7 @@ class DibiFirebirdDriver extends DibiObject implements IDibiDriver, IDibiReflect * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { throw new NotImplementedException; } diff --git a/dibi/drivers/mssql.php b/dibi/drivers/mssql.php index 3b35aec9..6ef5f354 100644 --- a/dibi/drivers/mssql.php +++ b/dibi/drivers/mssql.php @@ -313,7 +313,7 @@ class DibiMsSqlDriver extends DibiObject implements IDibiDriver * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = mssql_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/mssql2005.php b/dibi/drivers/mssql2005.php index 9930a149..156471d7 100644 --- a/dibi/drivers/mssql2005.php +++ b/dibi/drivers/mssql2005.php @@ -315,7 +315,7 @@ class DibiMsSql2005Driver extends DibiObject implements IDibiDriver * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = sqlsrv_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/mysql.php b/dibi/drivers/mysql.php index 634450fc..db184aa3 100644 --- a/dibi/drivers/mysql.php +++ b/dibi/drivers/mysql.php @@ -395,7 +395,7 @@ class DibiMySqlDriver extends DibiObject implements IDibiDriver, IDibiReflector * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = mysql_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/mysqli.php b/dibi/drivers/mysqli.php index 92957e67..605e1405 100644 --- a/dibi/drivers/mysqli.php +++ b/dibi/drivers/mysqli.php @@ -390,7 +390,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiReflector * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { static $types; if (empty($types)) { diff --git a/dibi/drivers/odbc.php b/dibi/drivers/odbc.php index d296e4da..4d6f4409 100644 --- a/dibi/drivers/odbc.php +++ b/dibi/drivers/odbc.php @@ -340,7 +340,7 @@ class DibiOdbcDriver extends DibiObject implements IDibiDriver, IDibiReflector * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = odbc_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/oracle.php b/dibi/drivers/oracle.php index de54ae6b..91ead6f3 100644 --- a/dibi/drivers/oracle.php +++ b/dibi/drivers/oracle.php @@ -328,7 +328,7 @@ class DibiOracleDriver extends DibiObject implements IDibiDriver, IDibiReflector * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = oci_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/pdo.php b/dibi/drivers/pdo.php index 6f1eef5f..8474d91a 100644 --- a/dibi/drivers/pdo.php +++ b/dibi/drivers/pdo.php @@ -393,7 +393,7 @@ class DibiPdoDriver extends DibiObject implements IDibiDriver * @return array * @throws DibiException */ - public function getColumnsMeta() + public function getResultColumns() { $count = $this->resultSet->columnCount(); $res = array(); diff --git a/dibi/drivers/postgre.php b/dibi/drivers/postgre.php index f3934d37..1616b1e4 100644 --- a/dibi/drivers/postgre.php +++ b/dibi/drivers/postgre.php @@ -369,7 +369,7 @@ class DibiPostgreDriver extends DibiObject implements IDibiDriver, IDibiReflecto * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $hasTable = version_compare(PHP_VERSION , '5.2.0', '>='); $count = pg_num_fields($this->resultSet); diff --git a/dibi/drivers/sqlite.php b/dibi/drivers/sqlite.php index f448abe2..eeea8279 100644 --- a/dibi/drivers/sqlite.php +++ b/dibi/drivers/sqlite.php @@ -347,7 +347,7 @@ class DibiSqliteDriver extends DibiObject implements IDibiDriver, IDibiReflector * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = sqlite_num_fields($this->resultSet); $res = array(); diff --git a/dibi/drivers/sqlite3.php b/dibi/drivers/sqlite3.php index 8f9230ba..5341f888 100644 --- a/dibi/drivers/sqlite3.php +++ b/dibi/drivers/sqlite3.php @@ -334,7 +334,7 @@ class DibiSqlite3Driver extends DibiObject implements IDibiDriver, IDibiReflecto * Returns metadata for all columns in a result set. * @return array */ - public function getColumnsMeta() + public function getResultColumns() { $count = $this->resultSet->numColumns(); $res = array(); diff --git a/dibi/libs/DibiDatabaseInfo.php b/dibi/libs/DibiDatabaseInfo.php index 392ceec3..83e7a4f8 100644 --- a/dibi/libs/DibiDatabaseInfo.php +++ b/dibi/libs/DibiDatabaseInfo.php @@ -433,7 +433,7 @@ class DibiResultInfo extends DibiObject { if ($this->columns === NULL) { $this->columns = array(); - foreach ($this->driver->getColumnsMeta() as $info) { + foreach ($this->driver->getResultColumns() as $info) { $this->columns[] = $this->names[$info['name']] = new DibiColumnInfo($this->driver, $info); } } diff --git a/dibi/libs/interfaces.php b/dibi/libs/interfaces.php index 958548c0..ee2b9915 100644 --- a/dibi/libs/interfaces.php +++ b/dibi/libs/interfaces.php @@ -223,7 +223,7 @@ interface IDibiDriver * Returns metadata for all columns in a result set. * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]} */ - function getColumnsMeta(); + function getResultColumns(); /** * Returns the result set resource.