From 1604f4728b95cc8b8b53779532bb9ba66f27cd58 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 18 Mar 2014 09:00:16 +0100 Subject: [PATCH] Fix that the TreeToSqlParser cannot handle partial conjunction nodes --- library/Icinga/Data/Db/TreeToSqlParser.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library/Icinga/Data/Db/TreeToSqlParser.php b/library/Icinga/Data/Db/TreeToSqlParser.php index 20638bf74..b1d482ef7 100644 --- a/library/Icinga/Data/Db/TreeToSqlParser.php +++ b/library/Icinga/Data/Db/TreeToSqlParser.php @@ -112,15 +112,14 @@ class TreeToSqlParser private function parseConjunctionNode(Node $node) { $queryString = ''; - $leftQuery = $this->nodeToSqlQuery($node->left); - $rightQuery = $this->nodeToSqlQuery($node->right); + $leftQuery = $node->left !== null ? $this->nodeToSqlQuery($node->left) : ''; + $rightQuery = $node->right !== null ? $this->nodeToSqlQuery($node->right) : ''; if ($leftQuery != '') { $queryString .= $leftQuery . ' '; } if ($rightQuery != '') { - $queryString .= (($queryString !== '') ? $node->type . ' ' : ' ') . $rightQuery; } return $queryString;