bugfix in WhereClause: negate didn't wrap multiple clauses in extra parens

Fixes #41
2017-10-15 19:10:35 +00:00
parent 22e49b280e
commit 8e19d9d6c3
2 changed files with 13 additions and 3 deletions
--- a/db.class.php
+++ b/db.class.php
@@ -873,8 +873,8 @@ class WhereClause {
      $args = array_merge($args, $clause_args);
    }
    
-    if ($this->type == 'and') $sql = implode(' AND ', $sql);
-    else $sql = implode(' OR ', $sql);
+    if ($this->type == 'and') $sql = sprintf('(%s)', implode(' AND ', $sql));
+    else $sql = sprintf('(%s)', implode(' OR ', $sql));
    
    if ($this->negate) $sql = '(NOT ' . $sql . ')';
    return array($sql, $args);