Skip to content

[5.x] Fix whereNotIn error with nulls #13266

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
jasonvarga merged 2 commits into from
Dec 8, 2025
Merged

[5.x] Fix whereNotIn error with nulls #13266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc048c6
use a placeholder for nulls
jasonvarga Dec 5, 2025
d2118cc
add test
jasonvarga Dec 8, 2025
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
8 changes: 4 additions & 4 deletions src/Stache/Query/Builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,19 +157,19 @@ protected function filterWhereBasic($values, $where)

protected function filterWhereIn($values, $where)
{
$lookup = array_flip($where['values']);
$lookup = array_flip(array_map(fn ($v) => $v ?? '__NULL__', $where['values']));

return $values->filter(
fn ($value) => isset($lookup[$value])
fn ($value) => isset($lookup[$value ?? '__NULL__'])
);
}

protected function filterWhereNotIn($values, $where)
{
$lookup = array_flip($where['values']);
$lookup = array_flip(array_map(fn ($v) => $v ?? '__NULL__', $where['values']));

return $values->filter(
fn ($value) => ! isset($lookup[$value])
fn ($value) => ! isset($lookup[$value ?? '__NULL__'])
);
}

Expand Down
30 changes: 30 additions & 0 deletions tests/Data/Entries/EntryQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,36 @@ public function entries_are_found_using_or_where_not_in()
$this->assertEquals(['Post 3', 'Post 4'], $entries->map->title->all());
}

#[Test]
public function entries_are_found_using_where_in_with_null()
{
EntryFactory::id('1')->slug('post-1')->collection('posts')->data(['title' => 'Post 1', 'category' => 'news'])->create();
EntryFactory::id('2')->slug('post-2')->collection('posts')->data(['title' => 'Post 2', 'category' => 'blog'])->create();
EntryFactory::id('3')->slug('post-3')->collection('posts')->data(['title' => 'Post 3'])->create(); // category is null
EntryFactory::id('4')->slug('post-4')->collection('posts')->data(['title' => 'Post 4', 'category' => 'news'])->create();
EntryFactory::id('5')->slug('post-5')->collection('posts')->data(['title' => 'Post 5'])->create(); // category is null

$entries = Entry::query()->whereIn('category', ['news', null])->get();

$this->assertCount(4, $entries);
$this->assertEquals(['Post 1', 'Post 3', 'Post 4', 'Post 5'], $entries->map->title->all());
}

#[Test]
public function entries_are_found_using_where_not_in_with_null()
{
EntryFactory::id('1')->slug('post-1')->collection('posts')->data(['title' => 'Post 1', 'category' => 'news'])->create();
EntryFactory::id('2')->slug('post-2')->collection('posts')->data(['title' => 'Post 2', 'category' => 'blog'])->create();
EntryFactory::id('3')->slug('post-3')->collection('posts')->data(['title' => 'Post 3'])->create(); // category is null
EntryFactory::id('4')->slug('post-4')->collection('posts')->data(['title' => 'Post 4', 'category' => 'news'])->create();
EntryFactory::id('5')->slug('post-5')->collection('posts')->data(['title' => 'Post 5'])->create(); // category is null

$entries = Entry::query()->whereNotIn('category', ['news', null])->get();

$this->assertCount(1, $entries);
$this->assertEquals(['Post 2'], $entries->map->title->all());
}

#[Test]
public function entries_are_found_using_where_date()
{
Expand Down