Adjusted tests

elvanto · Nov 20, 2024 · cd52b10 · cd52b10
1 parent 09dda29
commit cd52b10
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/tests/MysqlTableTest.php b/tests/MysqlTableTest.php
@@ -327,7 +327,15 @@ public function testNotConditions()
     {
         $table = $this->db->table('test');
 
-        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? AND `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
+    }
+
+    public function testNotEmbeddedConditions()
+    {
+        $table = $this->db->table('test');
+
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->beginOr()->eq('a', 1)->eq('b', 2)->closeOr()->closeNot()->buildSelectQuery());
         $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
     }
 

diff --git a/tests/PostgresTableTest.php b/tests/PostgresTableTest.php
@@ -326,7 +326,15 @@ public function testNotConditions()
     {
         $table = $this->db->table('test');
 
-        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? AND `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
+    }
+
+    public function testNotEmbeddedConditions()
+    {
+        $table = $this->db->table('test');
+
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->beginOr()->eq('a', 1)->eq('b', 2)->closeOr()->closeNot()->buildSelectQuery());
         $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
     }
 

diff --git a/tests/SqliteTableTest.php b/tests/SqliteTableTest.php
@@ -372,7 +372,15 @@ public function testNotConditions()
     {
         $table = $this->db->table('test');
 
-        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? AND `b` = ?)', $table->beginNot()->eq('a', 1)->eq('b', 2)->closeNot()->buildSelectQuery());
+        $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
+    }
+
+    public function testNotEmbeddedConditions()
+    {
+        $table = $this->db->table('test');
+
+        $this->assertEquals('SELECT * FROM `test`   WHERE NOT (`a` = ? OR `b` = ?)', $table->beginNot()->beginOr()->eq('a', 1)->eq('b', 2)->closeOr()->closeNot()->buildSelectQuery());
         $this->assertEquals(array(2), $table->getConditionBuilder()->getValues());
     }