Merge pull request #59 from vimeo/support-not-statements

fix the negation evaluations in fake sql

Author: aaronm67

src/Processor/Expression/BinaryOperatorEvaluator.php

@@ -152,7 +152,7 @@ public static function evaluate(
                             return !$expr->negatedInt;
                         }
 
-                        return $l_value == $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ($l_value == $r_value ? 1 : 0 ) ^ $expr->negatedInt;
 
                     case '<>':
                     case '!=':
@@ -165,35 +165,35 @@ public static function evaluate(
                             return $expr->negatedInt;
                         }
 
-                        return $l_value != $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ($l_value != $r_value ? 1 : 0) ^ $expr->negatedInt;
 
                     case '>':
                         if ($as_string) {
-                            return (string) $l_value > (string) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                            return ((string) $l_value > (string) $r_value ? 1 : 0) ^ $expr->negatedInt;
                         }
 
-                        return (float) $l_value > (float) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ((float) $l_value > (float) $r_value ? 1 : 0 ) ^ $expr->negatedInt;
                         // no break
                     case '>=':
                         if ($as_string) {
-                            return (string) $l_value >= (string) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                            return ((string) $l_value >= (string) $r_value ? 1 : 0) ^ $expr->negatedInt;
                         }
 
-                        return (float) $l_value >= (float) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ((float) $l_value >= (float) $r_value ? 1 : 0) ^ $expr->negatedInt;
 
                     case '<':
                         if ($as_string) {
-                            return (string) $l_value < (string) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                            return ((string) $l_value < (string) $r_value ? 1 : 0) ^ $expr->negatedInt;
                         }
 
-                        return (float) $l_value < (float) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ((float) $l_value < (float) $r_value ? 1 : 0) ^ $expr->negatedInt;
 
                     case '<=':
                         if ($as_string) {
-                            return (string) $l_value <= (string) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                            return ((string) $l_value <= (string) $r_value ? 1 : 0) ^ $expr->negatedInt;
                         }
 
-                        return (float) $l_value <= (float) $r_value ? 1 : 0 ^ $expr->negatedInt;
+                        return ((float) $l_value <= (float) $r_value ? 1 : 0) ^ $expr->negatedInt;
                 }
 
                 // PHPCS thinks there's a fallthrough here, but there provably is not

tests/EndToEndTest.php

@@ -1214,6 +1214,46 @@ public function testSelectNullableFields()
             $query->fetch(\PDO::FETCH_ASSOC)
         );
     }
+        
+    public function testNegateOperationWithAnd()
+    {
+        // greater than
+        $pdo = self::getConnectionToFullDB(false);
+        $query = $pdo->prepare("SELECT COUNT(*) as 'count' FROM `video_game_characters` WHERE `console` = :console AND NOT (`powerups` > :powerups)");
+        $query->bindValue(':console', 'nes');
+        $query->bindValue(':powerups', 3);
+        $query->execute();
+
+        $this->assertSame([['count' => 8]], $query->fetchAll(\PDO::FETCH_ASSOC));
+
+        // equals
+        $query = $pdo->prepare("SELECT COUNT(*) as 'count' FROM `video_game_characters` WHERE `console` = :console AND NOT (`powerups` = :powerups)");
+        $query->bindValue(':console', 'nes');
+        $query->bindValue(':powerups', 0);
+        $query->execute();
+
+        $this->assertSame([['count' => 2]], $query->fetchAll(\PDO::FETCH_ASSOC));
+    }
+
+    public function testNegateOperationWithOr()
+    {
+        // greater than
+        $pdo = self::getConnectionToFullDB(false);
+        $query = $pdo->prepare("SELECT COUNT(*) as 'count' FROM `video_game_characters` WHERE `console` = :console OR NOT (`powerups` > :powerups)");
+        $query->bindValue(':console', 'nes');
+        $query->bindValue(':powerups', 3);
+        $query->execute();
+
+        $this->assertSame([['count' => 16]], $query->fetchAll(\PDO::FETCH_ASSOC));
+
+        // equals
+        $query = $pdo->prepare("SELECT COUNT(*) as 'count' FROM `video_game_characters` WHERE `console` = :console OR NOT (`powerups` = :powerups)");
+        $query->bindValue(':console', 'nes');
+        $query->bindValue(':powerups', 0);
+        $query->execute();
+
+        $this->assertSame([['count' => 9]], $query->fetchAll(\PDO::FETCH_ASSOC));
+    }
 
     private static function getPdo(string $connection_string, bool $strict_mode = false) : \PDO
     {