Skip to content

fix(Search): Correctly search for strings with quotes and double quotes #624

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
merged 2 commits into from
Feb 25, 2025
Merged

fix(Search): Correctly search for strings with quotes and double quotes #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71fa3d5
fix(Search): Correctly search for strings with quotes and double quotes
arthurkirkosa Feb 25, 2025
e76e70e
Fix styling
arthurkirkosa Feb 25, 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
2 changes: 1 addition & 1 deletion src/Filters/SearchableFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function filter(RestifyRequest $request, $query, $value)
if (! config('restify.search.case_sensitive')) {
$upper = strtoupper($value);

return $query->orWhereRaw("UPPER({$this->column}) LIKE \"%{$upper}%\"");
return $query->orWhereRaw("UPPER({$this->column}) LIKE ?", ['%'.$upper.'%']);
}

return $query->orWhere($this->column, $likeOperator, "%{$value}%");
Expand Down
45 changes: 45 additions & 0 deletions tests/Feature/RepositorySearchServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,51 @@ public function test_can_search_using_belongs_to_field_with_custom_foreign_key()
->assertJsonCount(2, 'data');
}

public function test_can_search_strings_with_quotes_and_double_quotes(): void
{
Post::factory()->create([
'title' => "A Guy Named O'Neal was Standing at 5 o'clock with a 10\" cookie.",
]);

$this->getJson(PostRepository::route(query: ['search' => 'John']))
->assertJsonCount(0, 'data');

$this->getJson(PostRepository::route(query: ['search' => 'Guy']))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => "5 o'clock"]))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => '10" present']))
->assertJsonCount(0, 'data');

$this->getJson(PostRepository::route(query: ['search' => '10" cookie']))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => '150TPL5 (1 1/2" PVC SCH40 THREADED PLUG']))
->assertJsonCount(0, 'data');

config()->set('restify.search.case_sensitive', false);

$this->getJson(PostRepository::route(query: ['search' => 'John']))
->assertJsonCount(0, 'data');

$this->getJson(PostRepository::route(query: ['search' => 'Guy']))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => "5 o'clock"]))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => '10" present']))
->assertJsonCount(0, 'data');

$this->getJson(PostRepository::route(query: ['search' => '10" cookie']))
->assertJsonCount(1, 'data');

$this->getJson(PostRepository::route(query: ['search' => '150TPL5 (1 1/2" PVC SCH40 THREADED PLUG']))
->assertJsonCount(0, 'data');
}

public function test_can_match_closure(): void
{
User::factory(4)->create();
Expand Down