mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-10-22 18:26:13 +02:00
Code Issues Releases Wiki Activity

- Object renamed to DibiObject

Browse Source 
- DibiTranslator: improved %and and %or handling
- DibiTable::findAll allows to add conditions
This commit is contained in:
David Grudl
2008-09-05 05:35:15 +00:00
parent f935968aa7
commit e5af8a8c67
19 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dibi/libs/DibiTable.php
View File

@@ -26,7 +26,7 @@
* @copyright Copyright (c) 2005, 2008 David Grudl
* @package dibi
*/
abstract class DibiTable extends /*Nette::*/Object
abstract class DibiTable extends DibiObject
{
/** @var string primary key mask */
public static $primaryMask = 'id';
@@ -204,22 +204,23 @@ abstract class DibiTable extends /*Nette::*/Object
/**
* Selects all rows.
* @param array conditions
* @param string column to order by
* @return DibiResult
*/
public function findAll($order = NULL)
public function findAll($conditions = NULL, $order = NULL)
{
if ($order === NULL) {
return $this->complete($this->connection->query(
'SELECT * FROM %n', $this->name
));
$order = func_get_args();
if (is_array($conditions)) {
array_shift($order);
} else {
$order = func_get_args();
return $this->complete($this->connection->query(
'SELECT * FROM %n', $this->name,
'ORDER BY %n', $order
));
$conditions = NULL;
}
return $this->complete($this->connection->query(
'SELECT * FROM %n', $this->name,
'%ex', $conditions ? array('WHERE %and', $conditions) : NULL,
'%ex', $order ? array('ORDER BY %n', $order) : NULL
));
}