Fix BC break

Ignore empty strings in QueryBuilder::and/orWhere() & and/orHaving().
doctrine · Sep 22, 2020 · 7401cda · 7401cda
1 parent 5d22823
commit 7401cda
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/lib/Doctrine/DBAL/Query/QueryBuilder.php b/lib/Doctrine/DBAL/Query/QueryBuilder.php
@@ -8,9 +8,11 @@
 use Doctrine\DBAL\Query\Expression\CompositeExpression;
 use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
 
+use function array_filter;
 use function array_key_exists;
 use function array_keys;
 use function array_unshift;
+use function array_values;
 use function func_get_args;
 use function func_num_args;
 use function implode;
@@ -829,6 +831,7 @@ public function where($predicates)
     public function andWhere($where)
     {
         $args  = func_get_args();
+        $args  = self::filterEmptyArgs($args);
         $where = $this->getQueryPart('where');
 
         if ($where instanceof CompositeExpression && $where->getType() === CompositeExpression::TYPE_AND) {
@@ -862,6 +865,7 @@ public function andWhere($where)
     public function orWhere($where)
     {
         $args  = func_get_args();
+        $args  = self::filterEmptyArgs($args);
         $where = $this->getQueryPart('where');
 
         if ($where instanceof CompositeExpression && $where->getType() === CompositeExpression::TYPE_OR) {
@@ -1010,6 +1014,7 @@ public function having($having)
     public function andHaving($having)
     {
         $args   = func_get_args();
+        $args   = self::filterEmptyArgs($args);
         $having = $this->getQueryPart('having');
 
         if ($having instanceof CompositeExpression && $having->getType() === CompositeExpression::TYPE_AND) {
@@ -1033,6 +1038,7 @@ public function andHaving($having)
     public function orHaving($having)
     {
         $args   = func_get_args();
+        $args   = self::filterEmptyArgs($args);
         $having = $this->getQueryPart('having');
 
         if ($having instanceof CompositeExpression && $having->getType() === CompositeExpression::TYPE_OR) {
@@ -1393,4 +1399,21 @@ public function __clone()
             $this->params[$name] = clone $param;
         }
     }
+
+    /**
+     * Filters out empty values from the given argument list.
+     * Fixes a BC break introduces in 2.11: https://github.com/doctrine/dbal/issues/4282
+     *
+     * @param array<mixed> $args
+     *
+     * @return array<mixed>
+     *
+     * @todo remove for 3.0
+     */
+    private static function filterEmptyArgs(array $args): array
+    {
+        return array_values(array_filter($args, static function ($value) {
+            return ! empty($value);
+        }));
+    }
 }
diff --git a/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php b/tests/Doctrine/Tests/DBAL/Query/QueryBuilderTest.php
@@ -949,4 +949,17 @@ public function testJoinWithNonUniqueAliasThrowsException(): void
 
         $qb->getSQL();
     }
+
+    public function testAndWhereEmptyString(): void
+    {
+        $qb = new QueryBuilder($this->conn);
+
+        $qb->select('id')
+            ->from('foo')
+            ->where('a = b');
+
+        $qb->andWhere('', "foo = 'bar'");
+
+        self::assertSame("SELECT id FROM foo WHERE (a = b) AND (foo = 'bar')", $qb->getSQL());
+    }
 }