Merge pull request #1905 from bendavies/simplify-boolean-filter

Simplify boolean filter

Author: dunglas

src/Bridge/Doctrine/Orm/Filter/BooleanFilter.php

@@ -96,11 +96,9 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
             list($alias, $field) = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
         }
 
-        $valueParameter = $queryNameGenerator->generateParameterName($field);
-
+        $expr = $queryBuilder->expr();
         $queryBuilder
-            ->andWhere(sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
-            ->setParameter($valueParameter, $value);
+            ->andWhere($expr->eq(sprintf('%s.%s', $alias, $field), $expr->literal($value)));
     }
 
     /**

tests/Bridge/Doctrine/Orm/Filter/BooleanFilterTest.php

@@ -67,7 +67,7 @@ public function provideApplyTestData(): array
                 [
                     'dummyBoolean' => 'true',
                 ],
-                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = true', Dummy::class),
             ],
             'string ("false")' => [
                 [
@@ -78,7 +78,7 @@ public function provideApplyTestData(): array
                 [
                     'dummyBoolean' => 'false',
                 ],
-                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
             ],
             'non-boolean' => [
                 [
@@ -100,7 +100,7 @@ public function provideApplyTestData(): array
                 [
                     'dummyBoolean' => '0',
                 ],
-                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
             ],
             'numeric string ("1")' => [
                 [
@@ -111,7 +111,7 @@ public function provideApplyTestData(): array
                 [
                     'dummyBoolean' => '1',
                 ],
-                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = true', Dummy::class),
             ],
             'nested properties' => [
                 [
@@ -122,7 +122,7 @@ public function provideApplyTestData(): array
                 [
                     'relatedDummy.dummyBoolean' => '1',
                 ],
-                sprintf('SELECT o FROM %s o INNER JOIN o.relatedDummy relatedDummy_a1 WHERE relatedDummy_a1.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o INNER JOIN o.relatedDummy relatedDummy_a1 WHERE relatedDummy_a1.dummyBoolean = true', Dummy::class),
             ],
             'numeric string ("1") on non-boolean property' => [
                 [
@@ -180,7 +180,7 @@ public function provideApplyTestData(): array
                     'name' => 'true',
                     'id' => '0',
                 ],
-                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
+                sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
             ],
         ];
     }