Skip to content

Commit d7b3c0a

Browse files
committed
Merge branch 'Enaah-feature/search-through-virtual-columns' into develop
2 parents b15ec30 + a351d4b commit d7b3c0a

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/Traits/WithFilters.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
namespace Rappasoft\LaravelLivewireTables\Traits;
44

55
use DateTime;
6+
use Illuminate\Support\Facades\Schema;
67
use Illuminate\Database\Eloquent\Builder;
7-
use Illuminate\Database\Eloquent\Relations\Relation;
8-
use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;
98
use Rappasoft\LaravelLivewireTables\Views\Column;
109
use Rappasoft\LaravelLivewireTables\Views\Filter;
10+
use Illuminate\Database\Eloquent\Relations\Relation;
11+
use Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities;
1112

1213
/**
1314
* Trait WithFilters.
@@ -316,7 +317,7 @@ public function applySearchFilter($query)
316317

317318
// TODO: Skip Aggregates
318319
if (! $hasRelation) {
319-
$whereColumn = $query->getModel()->getTable() . '.' . $whereColumn;
320+
$whereColumn = Schema::hasColumn($query->getModel()->getTable(), $whereColumn) ? $query->getModel()->getTable() . '.' . $whereColumn : $whereColumn;
320321
}
321322

322323
// We can use a simple where clause

0 commit comments

Comments
 (0)