DDC-3065 - applying hotfix that allows NULL in IN() criteria

doctrine · Apr 3, 2014 · 733102b · 733102b
1 parent a8b9680
commit 733102b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
@@ -1534,7 +1534,13 @@ public function getSelectConditionStatementSQL($field, $value, $assoc = null, $c
         }
 
         if (is_array($value)) {
-            return sprintf('%s IN (%s)' , $condition, $placeholder);
+            $in = sprintf('%s IN (%s)' , $condition, $placeholder);
+
+            if (false !== array_search(null, $value, true)) {
+                return sprintf('(%s OR %s IS NULL)' , $in, $condition);
+            }
+
+            return $in;
         }
 
         if ($value === null) {