lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Move multiple column search function to Searchable trait

Browse source
This commit is contained in:
Marcus Moore 2023-05-18 13:05:40 -07:00
parent 9cb0decf35
commit d8d672c4c1
No known key found for this signature in database
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Models/Traits/Searchable.php
View file

@ -257,4 +257,15 @@ trait Searchable
return $related->getTable();
}
private function buildMultipleColumnSearch(array $columns): string
{
$driver = config('database.connections.' . config('database.default') . '.driver');
if ($driver === 'sqlite') {
return implode(" || ' ' || ", $columns) . ' LIKE ?';
}
return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
}
}

11
app/Models/User.php
View file

@ -657,17 +657,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
return $query;
}
public function buildMultipleColumnSearch(array $columns): string
{
$driver = config('database.connections.' . config('database.default') . '.driver');
if ($driver === 'sqlite') {
return implode(" || ' ' || ", $columns) . ' LIKE ?';
}
return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
}
/**
* Run additional, advanced searches.
*