Skip to content

Laravel 12.x Compatibility #88

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 4 commits into from
Feb 19, 2025
Merged

Laravel 12.x Compatibility #88

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62d28bb
Bump dependencies for Laravel 12
laravel-shift Feb 19, 2025
a1d77ae
Update GitHub Actions for Laravel 12
laravel-shift Feb 19, 2025
afab6fd
Bump deps
pascalbaljet Feb 19, 2025
05b5bea
Update Searcher.php
pascalbaljet Feb 19, 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
Prev Previous commit
Update Searcher.php
  • Loading branch information
@pascalbaljet
pascalbaljet committed Feb 19, 2025
commit 05b5bea44a366a9bfaeb95096a044cc04038c450
7 changes: 4 additions & 3 deletions src/Searcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ private function addNestedRelationToQuery(Builder $query, string $nestedRelation
*/
private function addWhereTermsToQuery(Builder $query, $column)
{
$column = $this->ignoreCase ? (new MySqlGrammar)->wrap($column) : $column;
$column = $this->ignoreCase ? (new MySqlGrammar($query->getConnection()))->wrap($column) : $column;

$this->terms->each(function ($term) use ($query, $column) {
$this->ignoreCase
Expand All @@ -510,8 +510,9 @@ private function addRelevanceQueryToBuilder($builder, $modelToSearchThrough)
}

$expressionsAndBindings = $modelToSearchThrough->getQualifiedColumns()->flatMap(function ($field) use ($modelToSearchThrough) {
$prefix = $modelToSearchThrough->getModel()->getConnection()->getTablePrefix();
$field = (new MySqlGrammar)->wrap($prefix . $field);
$connection = $modelToSearchThrough->getModel()->getConnection();
$prefix = $connection->getTablePrefix();
$field = (new MySqlGrammar($connection))->wrap($prefix . $field);

return $this->termsWithoutWildcards->map(function ($term) use ($field) {
return [
Expand Down
Loading