mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-21 05:11:49 +02:00
Code Issues Releases Wiki Activity

- DibiPostgreDriver - workaround for bug in pg_affected_rows

Browse Source 
- added DibiResult::setObjects([TRUE | FALSE | class name])
This commit is contained in:
David Grudl
2008-05-12 22:55:51 +00:00
parent 7bb5684d71
commit 40e9f313c3
9 changed files with 91 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
dibi/libs/DibiResult.php
View File

@@ -74,10 +74,10 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
private $withTables = FALSE;
/**
* Fetch as object?
* @var bool
* Fetch as objects or arrays?
* @var mixed TRUE | FALSE | class name
*/
public $asObjects = FALSE;
private $objects = FALSE;
@@ -98,8 +98,14 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
public function __construct($driver, $config)
{
$this->driver = $driver;
$this->setWithTables(!empty($config['result:withtables']));
$this->asObjects = !empty($config['result:objects']);
if (!empty($config['result:withtables'])) {
$this->setWithTables(TRUE);
}
if (isset($config['result:objects'])) {
$this->setObjects($config['result:objects']);
}
}
@@ -215,14 +221,39 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
/**
* Returns rows as arrays or objects?
*
* @param mixed TRUE | FALSE | class name
* @return void
*/
public function setObjects($type)
{
$this->objects = is_string($type) ? $type : (bool) $type;
}
/**
* Returns rows as arrays or objects?
*
* @return mixed TRUE | FALSE | class name
*/
public function getObjects()
{
return $this->objects;
}
/**
* Fetches the row at current position, process optional type conversion.
* and moves the internal cursor to the next position
*
* @param bool fetch as object? Overrides $this->asObjects
* @param mixed fetch as object? Overrides $this->setObjects()
* @return array|FALSE array on success, FALSE if no next record
*/
final public function fetch($asObject = NULL)
final public function fetch($objects = NULL)
{
if ($this->withTables === FALSE) {
$row = $this->getDriver()->fetch(TRUE);
@@ -245,10 +276,18 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
}
}
if ($asObject || ($asObject === NULL && $this->asObjects)) {
$row = (object) $row;
if ($objects === NULL) {
$objects = $this->objects;
}
if ($objects) {
if ($objects === TRUE) {
$row = (object) $row;
} else {
$row = new $objects($row);
}
}
return $row;
}
@@ -286,18 +325,18 @@ class DibiResult extends /*Nette::*/Object implements IDataSource
final function fetchAll()
{
$this->seek(0);
$row = $this->fetch(FALSE);
$row = $this->fetch();
if (!$row) return array(); // empty resultset
$data = array();
if (count($row) === 1) {
if (!$this->objects && count($row) === 1) {
// special case: one-column result set
$key = key($row);
do {
$data[] = $row[$key];
} while ($row = $this->fetch(FALSE));
} while ($row = $this->fetch());
} else {
if ($this->asObjects) $row = (object) $row;
do {
$data[] = $row;
} while ($row = $this->fetch());