tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 13:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Support selecting NULL as column

Browse Source 
refs #9009
This commit is contained in:
Eric Lippmann 2015-05-26 16:59:38 +02:00
parent b24e3393f0
commit b0576d93de
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php
View File

@ -3,14 +3,15 @@
namespace Icinga\Module\Monitoring\Backend\Ido\Query; namespace Icinga\Module\Monitoring\Backend\Ido\Query;
use Icinga\Exception\IcingaException; use Zend_Db_Expr;
use Icinga\Application\Icinga;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Data\Db\DbQuery; use Icinga\Data\Db\DbQuery;
use Icinga\Exception\ProgrammingError;
use Icinga\Application\Icinga;
use Icinga\Web\Session;
use Icinga\Data\Filter\Filter; use Icinga\Data\Filter\Filter;
use Icinga\Data\Filter\FilterExpression; use Icinga\Data\Filter\FilterExpression;
use Icinga\Exception\IcingaException;
use Icinga\Exception\ProgrammingError;
use Icinga\Web\Session;
/** /**
* Base class for Ido Queries * Base class for Ido Queries
@ -471,6 +472,11 @@ abstract class IdoQuery extends DbQuery
$resolvedColumns = array(); $resolvedColumns = array();
foreach ($columns as $alias => $col) { foreach ($columns as $alias => $col) {
if ($col instanceof Zend_Db_Expr) {
// Support selecting NULL as column for example
$resolvedColumns[$alias] = $col;
continue;
}
$this->requireColumn($col); $this->requireColumn($col);
if ($this->isCustomvar($col)) { if ($this->isCustomvar($col)) {
$name = $this->getCustomvarColumnName($col); $name = $this->getCustomvarColumnName($col);
@ -682,6 +688,14 @@ abstract class IdoQuery extends DbQuery
return $this->idxAliasColumn[$alias]; return $this->idxAliasColumn[$alias];
} }
/**
* Create a sub query
*
* @param string $queryName
* @param array $columns
*
* @return static
*/
protected function createSubQuery($queryName, $columns = array()) protected function createSubQuery($queryName, $columns = array())
{ {
$class = '\\' $class = '\\'