Commit 78ce54a7 authored by lsmith's avatar lsmith

- added colnum parameter to fetchOne and fetchColumn

- use fetchColumn() in fetchOne()
- removed PORTABILITY_FIX_CASE handling in fetchColumn() since this can be handled by PDO internally
parent 2933cd2d
...@@ -489,10 +489,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun ...@@ -489,10 +489,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
* *
* @param string $statement sql query to be executed * @param string $statement sql query to be executed
* @param array $params prepared statement params * @param array $params prepared statement params
* @param int $colnum 0-indexed column number to retrieve
* @return mixed * @return mixed
*/ */
public function fetchOne($statement, array $params = array()) { public function fetchOne($statement, array $params = array(), $colnum = 0) {
return current($this->execute($statement, $params)->fetch(PDO::FETCH_NUM)); return $this->execute($statement, $params)->fetchColumn($colnum);
} }
/** /**
* fetchRow * fetchRow
...@@ -519,15 +520,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun ...@@ -519,15 +520,11 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
* *
* @param string $statement sql query to be executed * @param string $statement sql query to be executed
* @param array $params prepared statement params * @param array $params prepared statement params
* @param int $colnum 0-indexed column number to retrieve
* @return array * @return array
*/ */
public function fetchColumn($statement, array $params = array()) { public function fetchColumn($statement, array $params = array(), $colnum = 0) {
$result = $this->query($statement, $params)->fetchAll(PDO::FETCH_COLUMN); return $this->query($statement, $params)->fetchAll(PDO::FETCH_COLUMN, $colnum);
if ($this->options['portability'] & Doctrine::PORTABILITY_FIX_CASE) {
$result = array_map(($this->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $result);
}
return $result;
} }
/** /**
* fetchAssoc * fetchAssoc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment