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

clean up

Browse Source
This commit is contained in:
Dan Harrin
2025-07-10 10:47:42 +01:00
parent 03c26405ef
commit c4ea3093be
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/support/src/helpers.php
+8 -11
View File
@@ -167,27 +167,24 @@ if (! function_exists('Filament\Support\generate_search_column_expression')) {
'pgsql' => (
str($column)->contains('->')
? (
// Handle table.field part with double quotes
// Handle `table.field` part with double quotes
str($column)
->before('->')
->explode('.')
->map(fn (string $part) => str($part)->wrap('"'))
->map(fn (string $part): string => (string) str($part)->wrap('"'))
->implode('.')
) .
// Handle JSON path parts
collect(str($column)->after('->')->explode('->'))
->map(function ($segment, $index) use ($column) {
) . collect(str($column)->after('->')->explode('->')) // Handle JSON path parts
->map(function ($segment, $index) use ($column): string {
$totalParts = substr_count($column, '->');
return ($index === $totalParts - 1)
? "->>'$segment'"
: "->'$segment'";
return ($index === ($totalParts - 1))
? "->>'{$segment}'"
: "->'{$segment}'";
})
->implode('')
: str($column)
->explode('.')
->map(fn (string $part) => str($part)->wrap('"'))
->map(fn (string $part): string => (string) str($part)->wrap('"'))
->implode('.')
) . '::text',
default => $column,
tests/src/Support/helpersTest.php
+7 -7
View File
@@ -44,7 +44,7 @@ it('will prepare data attributes', function () {
]);
});
it('will generate json search column expression for mysql', function () {
it('will generate a JSON search column expression for MySQL', function () {
$column = 'data->name';
$isSearchForcedCaseInsensitive = true;
@@ -62,7 +62,7 @@ it('will generate json search column expression for mysql', function () {
->toBe("lower(json_extract(`data`, '$.\"name\"'))");
});
it('will generate json search column expression for pgsql', function () {
it('will generate a JSON search column expression for Postgres', function () {
$column = 'data->name';
$isSearchForcedCaseInsensitive = true;
@@ -78,7 +78,7 @@ it('will generate json search column expression for pgsql', function () {
->toBe("lower(\"data\"->>'name'::text)");
});
it('will generate nested json search column expression for pgsql', function () {
it('will generate a nested JSON search column expression for Postgres', function () {
$column = 'data->name->value->en';
$isSearchForcedCaseInsensitive = true;
@@ -94,7 +94,7 @@ it('will generate nested json search column expression for pgsql', function () {
->toBe("lower(\"data\"->'name'->'value'->>'en'::text)");
});
it('will generate column expression for pgsql with colons in the name', function (string $column, string $text) {
it('will generate a column expression for Postgres with colons in the table name', function (string $column, string $expectedExpression) {
$isSearchForcedCaseInsensitive = true;
$databaseConnection = Mockery::mock(Connection::class);
@@ -103,10 +103,10 @@ it('will generate column expression for pgsql with colons in the name', function
$grammar = new PostgresGrammar($databaseConnection);
$expression = generate_search_column_expression($column, $isSearchForcedCaseInsensitive, $databaseConnection);
$actualExpression = generate_search_column_expression($column, $isSearchForcedCaseInsensitive, $databaseConnection);
expect($expression->getValue($grammar))
->toBe($text);
expect($actualExpression->getValue($grammar))
->toBe($expectedExpression);
})
->with([
['blog:posts.title', 'lower("blog:posts"."title"::text)'],