few more fixes and tests for WhereClause

2011-09-23 22:03:15 -07:00
parent 80cc78edcd
commit a1f01a4f87
2 changed files with 43 additions and 1 deletions
--- a/db.class.php
+++ b/db.class.php
@@ -614,7 +614,13 @@ class WhereClause {
  
  function negateLast() {
    $i = count($this->clauses) - 1;
-    $this->clauses[$i] = 'NOT (' . $this->clauses[$i] . ')';
+    if (!isset($this->clauses[$i])) return;
+    
+    if ($this->clauses[$i] instanceof WhereClause) {
+      $this->clauses[$i]->negate();
+    } else {
+      $this->clauses[$i] = 'NOT (' . $this->clauses[$i] . ')';
+    }
  }
  
  function negate() {