fix where with operator null and value !== null

tflori · Feb 10, 2017 · a4ee039 · a4ee039
1 parent fc6eb43
commit a4ee039
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/src/Exceptions/NoOperator.php b/src/Exceptions/NoOperator.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace ORM\Exceptions;
+
+use ORM\Exception;
+
+class NoOperator extends Exception
+{
+}
diff --git a/src/QueryBuilder/QueryBuilder.php b/src/QueryBuilder/QueryBuilder.php
@@ -3,6 +3,8 @@
 namespace ORM\QueryBuilder;
 
 use ORM\EntityManager;
+use ORM\Exception;
+use ORM\Exceptions\NoOperator;
 
 /**
  * Build a ansi sql query / select statement
@@ -137,8 +139,7 @@ public function getEntityManager()
      * @param string $operator Operator or value if operator is omited
      * @param string $value    Value or array of values
      * @return string
-     * @throws \ORM\Exceptions\NoConnection
-     * @throws \ORM\Exceptions\NotScalar
+     * @throws NoOperator
      * @internal
      */
     public function createWhereCondition($column, $operator = null, $value = null)
@@ -149,8 +150,12 @@ public function createWhereCondition($column, $operator = null, $value = null)
         } elseif ($operator === null && $value === null) {
             $expression = $column;
         } else {
-            if (!$value) {
+            if ($value === null) {
                 $value = $operator;
+                $operator = null;
+            }
+
+            if ($operator === null) {
                 if (is_array($value)) {
                     $operator = 'IN';
                 } else {

diff --git a/tests/QueryBuilder/WhereConditionsTest.php b/tests/QueryBuilder/WhereConditionsTest.php
@@ -189,4 +189,13 @@ public function testCreatesWhereEmpty()
 
         self::assertSame('SELECT * FROM foobar WHERE a = \'\'', $query->getQuery());
     }
+
+    public function testUsesEqualityOperator()
+    {
+        $query = new QueryBuilder('foobar');
+
+        $query->where('a', null, '');
+
+        self::assertSame('SELECT * FROM foobar WHERE a = \'\'', $query->getQuery());
+    }
 }