Skip to content

Fix sorting by numbers when using collection in condition #513

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 2 commits into from
Oct 22, 2025
Merged

Fix sorting by numbers when using collection in condition #513

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
cb738f4
Fix sorting by floats when using collection `in` condition
jacksleight Oct 22, 2025
4d23acb
why doesnt pint catch this
ryanmitchell Oct 22, 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
14 changes: 9 additions & 5 deletions src/Entries/EntryQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,15 @@ protected function getJsonCasts(): IlluminateCollection
$wheres = collect($this->builder->getQuery()->wheres);
$collectionWhere = $wheres->firstWhere('column', 'collection');

if (
! $collectionWhere
|| ! isset($collectionWhere['value'])
|| ! ($collection = Collection::find($collectionWhere['value']))
) {
if (! $collectionWhere) {
return collect([]);
}

if (isset($collectionWhere['values']) && count($collectionWhere['values']) == 1) {
$collectionWhere['value'] = $collectionWhere['values'][0];
}

if (! isset($collectionWhere['value']) || ! $collection = Collection::find($collectionWhere['value'])) {
return collect([]);
}

Expand Down
11 changes: 8 additions & 3 deletions tests/Data/Entries/EntryQueryBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,14 +770,19 @@ public function entries_can_be_ordered_by_a_float_json_field()
Blueprint::shouldReceive('in')->with('collections/posts')->andReturn(collect(['posts' => $blueprint]));

Collection::make('posts')->save();
EntryFactory::id('1')->slug('post-1')->collection('posts')->data(['title' => 'Post 1', 'float' => 3.3])->create();
EntryFactory::id('2')->slug('post-2')->collection('posts')->data(['title' => 'Post 2', 'float' => 5.5])->create();
EntryFactory::id('3')->slug('post-3')->collection('posts')->data(['title' => 'Post 3', 'float' => 1.1])->create();
EntryFactory::id('1')->slug('post-1')->collection('posts')->data(['title' => 'Post 1', 'float' => '9.5'])->create();
EntryFactory::id('2')->slug('post-2')->collection('posts')->data(['title' => 'Post 2', 'float' => '10.2'])->create();
EntryFactory::id('3')->slug('post-3')->collection('posts')->data(['title' => 'Post 3', 'float' => '8.7'])->create();

$entries = Entry::query()->where('collection', 'posts')->orderBy('float', 'asc')->get();

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

$entries = Entry::query()->whereIn('collection', ['posts'])->orderBy('float', 'asc')->get();

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

#[Test]
Expand Down