Support collations

filamentphp · Oct 27, 2023 · c89f86b · c89f86b
1 parent 59d8abb
commit c89f86b
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/support/src/helpers.php b/packages/support/src/helpers.php
@@ -166,11 +166,21 @@ function generate_search_column_expression(string $column, ?bool $isSearchForced
             default => false,
         };
 
-        if (! $isSearchForcedCaseInsensitive) {
-            return $column;
+        if ($isSearchForcedCaseInsensitive) {
+            $column = "lower({$column})";
+        }
+
+        $collation = $databaseConnection->getConfig('search_collation');
+
+        if (filled($collation)) {
+            $column = "{$column} collate {$collation}";
+        }
+
+        if ($isSearchForcedCaseInsensitive || filled($collation)) {
+            return new Expression($column);
         }
 
-        return new Expression("lower({$column})");
+        return $column;
     }
 }