tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DbRepository: Handle columns of type Zend_Db_Expr

This commit is contained in:
Johannes Meyer 2015-12-04 08:22:48 +01:00
parent e7399c312f
commit 0d1d3c3b8f
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Repository/DbRepository.php
View File

@ -3,6 +3,7 @@
namespace Icinga\Repository;
use Zend_Db_Expr;
use Icinga\Data\Db\DbConnection;
use Icinga\Data\Extensible;
use Icinga\Data\Filter\Filter;
@ -631,6 +632,10 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/
public function requireQueryColumn($table, $name, RepositoryQuery $query = null)
{
if ($name instanceof Zend_Db_Expr) {
return $name;
}
if ($query === null || $this->validateQueryColumnAssociation($table, $name)) {
return parent::requireQueryColumn($table, $name, $query);
}
@ -657,6 +662,10 @@ abstract class DbRepository extends Repository implements Extensible, Updatable,
*/
public function requireFilterColumn($table, $name, RepositoryQuery $query = null, FilterExpression $filter = null)
{
if ($name instanceof Zend_Db_Expr) {
return $name;
}
$joined = false;
if ($query === null) {
$column = $this->requireStatementColumn($table, $name);