From d8d672c4c15e40f3859509a1f6278f22c17e90fd Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 18 May 2023 13:05:40 -0700 Subject: [PATCH] Move multiple column search function to Searchable trait --- app/Models/Traits/Searchable.php | 11 +++++++++++ app/Models/User.php | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php index a7feb62957..687210788b 100644 --- a/app/Models/Traits/Searchable.php +++ b/app/Models/Traits/Searchable.php @@ -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 ?'; + } } diff --git a/app/Models/User.php b/app/Models/User.php index dd63a3c250..8f5946a65c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -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. *