Fixed SQL error when sorting by custom fields or Maria

brandonkelly · brandonkelly · commit 29d55d86b1db · 2024-07-17T07:09:57.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft CMS 5
 
+## Unreleased
+
+- Fixed a SQL error that could occur when sorting by custom fields on MariaDB.
+
 ## 5.2.7 - 2024-07-16
 
 - `craft\helpers\UrlHelper::actionUrl()` now returns URLs based on the primary site’s base URL (if it has one), for console requests if the `@web` alias wasn’t explicitly defined.
diff --git a/src/services/ElementSources.php b/src/services/ElementSources.php
@@ -23,6 +23,7 @@
 use craft\models\FieldLayout;
 use Illuminate\Support\Collection;
 use yii\base\Component;
+use yii\db\Expression;
 
 /**
  * The Element Sources service provides APIs for managing element indexes.
@@ -327,10 +328,14 @@ public function getSourceSortOptions(string $elementType, string $sourceKey): ar
             ->groupBy('attribute')
             ->map(function(Collection $group) {
                 $orderBys = $group->pluck('orderBy');
-                if ($orderBys->count() === 1 || $orderBys->doesntContain(fn($orderBy) => is_string($orderBy))) {
+                if ($orderBys->doesntContain(fn($orderBy) => is_string($orderBy))) {
                     return $group->first();
                 }
-                $expression = new CoalesceColumnsExpression($orderBys->all());
+                if ($orderBys->count() === 1) {
+                    $expression = new Expression($orderBys->first());
+                } else {
+                    $expression = new CoalesceColumnsExpression($orderBys->all());
+                }
                 return array_merge($group->first(), [
                     'orderBy' => $expression,
                 ]);
