Skip to content

Revert "Simplify boolean filter" #1907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2018
Merged

Revert "Simplify boolean filter" #1907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Bridge/Doctrine/Orm/Filter/BooleanFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,11 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
list($alias, $field) = $this->addJoinsForNestedProperty($property, $alias, $queryBuilder, $queryNameGenerator, $resourceClass);
}

$expr = $queryBuilder->expr();
$valueParameter = $queryNameGenerator->generateParameterName($field);

$queryBuilder
->andWhere($expr->eq(sprintf('%s.%s', $alias, $field), $expr->literal($value)));
->andWhere(sprintf('%s.%s = :%s', $alias, $field, $valueParameter))
->setParameter($valueParameter, $value);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions tests/Bridge/Doctrine/Orm/Filter/BooleanFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function provideApplyTestData(): array
[
'dummyBoolean' => 'true',
],
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = true', Dummy::class),
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
'string ("false")' => [
[
Expand All @@ -78,7 +78,7 @@ public function provideApplyTestData(): array
[
'dummyBoolean' => 'false',
],
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
'non-boolean' => [
[
Expand All @@ -100,7 +100,7 @@ public function provideApplyTestData(): array
[
'dummyBoolean' => '0',
],
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
'numeric string ("1")' => [
[
Expand All @@ -111,7 +111,7 @@ public function provideApplyTestData(): array
[
'dummyBoolean' => '1',
],
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = true', Dummy::class),
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
'nested properties' => [
[
Expand All @@ -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 = true', Dummy::class),
sprintf('SELECT o FROM %s o INNER JOIN o.relatedDummy relatedDummy_a1 WHERE relatedDummy_a1.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
'numeric string ("1") on non-boolean property' => [
[
Expand Down Expand Up @@ -180,7 +180,7 @@ public function provideApplyTestData(): array
'name' => 'true',
'id' => '0',
],
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = false', Dummy::class),
sprintf('SELECT o FROM %s o WHERE o.dummyBoolean = :dummyBoolean_p1', Dummy::class),
],
];
}
Expand Down