Skip to content
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

Jump to bottom

[BUG] - empty whereIn array results in condition ignored #265

Merged
merged 3 commits into from
Mar 10, 2021
Merged

[BUG] - empty whereIn array results in condition ignored #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16f2b5b
Fixes #200 - empty array in whereIn will result in a false condition …
VinceG Feb 18, 2021
0f21da6
Ignore unit test errors
VinceG Mar 3, 2021
c123e08
Merge branch 'master' into bugfix/200-empty-where-in
DevinCodes Mar 10, 2021
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
10 changes: 7 additions & 3 deletions src/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,13 @@ public function whereBetween($field, array $values): self
*/
public function whereIn($field, array $values): self
{
$wheres = array_map(function ($value) use ($field) {
return "$field={$this->transform($value)}";
}, array_values($values));
if(! empty($values)) {
$wheres = array_map(function ($value) use ($field) {
return "$field={$this->transform($value)}";
}, array_values($values));
} else {
$wheres = ['0 = 1'];
}

$this->wheres[] = $wheres;

Expand Down
11 changes: 11 additions & 0 deletions tests/Features/WhereQueriesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,17 @@ public function testWhereIn(): void
User::search('foo')->whereIn('id', [1, 2, 3, 4])->get();
}

public function testWhereInEmptyArray(): void
{
$this->mockIndex(User::class)->shouldReceive('search')->once()->with('foo', [
'numericFilters' => [
['0 = 1'],
],
])->andReturn(['hits' => []]);

User::search('foo')->whereIn('id', [])->get();
}

public function testMultipleWheres(): void
{
$this->mockIndex(User::class)->shouldReceive('search')->once()->with('foo', [
Expand Down