Skip to content

Fix compiling queries that use orderByRaw with expressions #57228

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
taylorotwell merged 3 commits into from
Sep 30, 2025
Merged

Fix compiling queries that use orderByRaw with expressions #57228

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
560667a
Fix compiling queries that use orderByRaw with expressions
LukeTowers Sep 30, 2025
3e9820b
Update src/Illuminate/Database/Query/Grammars/Grammar.php
LukeTowers Sep 30, 2025
1413f94
Add tests for compileOrders method in Grammar
LukeTowers Sep 30, 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
5 changes: 4 additions & 1 deletion src/Illuminate/Database/Query/Grammars/Grammar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,10 @@ protected function compileOrders(Builder $query, $orders)
*/
protected function compileOrdersToArray(Builder $query, $orders)
{
return array_map(function ($order) {
return array_map(function ($order) use ($query) {
if (isset($order['sql']) && $order['sql'] instanceof Expression) {
return $order['sql']->getValue($query->getGrammar());
}
return $order['sql'] ?? $this->wrap($order['column']).' '.$order['direction'];
}, $orders);
}
Expand Down