opensource/filament
3
0
Fork 0
mirror of https://github.com/filamentphp/filament.git synced 2026-09-24 15:42:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source
This commit is contained in:
Dan Harrin
2025-09-26 20:09:11 +01:00
parent d075cf7901 9877057d97
commit a4ddf48ff6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/actions/src/Exports/Jobs/PrepareCsvExport.php
+6 -1
View File
@@ -66,6 +66,7 @@ class PrepareCsvExport implements ShouldQueue
/** @var Connection $databaseConnection */
$databaseConnection = $query->getConnection();
$databaseGrammar = $query->getGrammar();
if ($databaseConnection->getDriverName() === 'pgsql') {
$originalOrders = collect($query->getQuery()->orders)
@@ -76,11 +77,15 @@ class PrepareCsvExport implements ShouldQueue
return ($order['column'] ?? null) === $qualifiedKeyName;
})
->unique(function (array $order): string {
->unique(function (array $order) use ($databaseGrammar): string {
if (($order['type'] ?? null) === 'Raw') {
return 'raw:' . ($order['sql'] ?? '');
}
if ($databaseGrammar->isExpression($order['column'] ?? null)) {
return 'expression:' . $order['column']->getValue($databaseGrammar);
}
return 'column:' . ($order['column'] ?? '');
});