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

DbQuery: Catch exceptions in __toString()

This commit is contained in:
Johannes Meyer 2015-11-12 16:32:29 +01:00
parent 140e288c0b
commit b182a31b90
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/Data/Db/DbQuery.php
View File

@ -3,7 +3,9 @@
namespace Icinga\Data\Db; namespace Icinga\Data\Db;
use Exception;
use Zend_Db_Select; use Zend_Db_Select;
use Icinga\Application\Logger;
use Icinga\Data\Filter\FilterAnd; use Icinga\Data\Filter\FilterAnd;
use Icinga\Data\Filter\FilterChain; use Icinga\Data\Filter\FilterChain;
use Icinga\Data\Filter\FilterNot; use Icinga\Data\Filter\FilterNot;
@ -382,8 +384,13 @@ class DbQuery extends SimpleQuery
*/ */
public function __toString() public function __toString()
{ {
try {
$select = (string) $this->getSelectQuery(); $select = (string) $this->getSelectQuery();
return $this->getIsSubQuery() ? ('(' . $select . ')') : $select; return $this->getIsSubQuery() ? ('(' . $select . ')') : $select;
} catch (Exception $e) {
Logger::debug('Failed to render DbQuery. An error occured: %s', $e);
return '';
}
} }
/** /**