From 25a44e249eabdafe165adfbe05835e473fceeb6f Mon Sep 17 00:00:00 2001 From: Salvatore Scalzi Date: Fri, 27 Nov 2020 11:06:35 +0100 Subject: [PATCH 1/2] driver connection model, instead of default conn --- src/Http/Livewire/LivewireDatatable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Http/Livewire/LivewireDatatable.php b/src/Http/Livewire/LivewireDatatable.php index a713b201..e1af7319 100644 --- a/src/Http/Livewire/LivewireDatatable.php +++ b/src/Http/Livewire/LivewireDatatable.php @@ -355,7 +355,7 @@ public function defaultSort() public function getSortString() { $column = $this->freshColumns[$this->sort]; - $dbTable = env('DB_CONNECTION'); + $driver = $this->builder()->getModel()->getConnection()->getConfig('driver'); switch (true) { case $column['sort']: @@ -375,7 +375,7 @@ public function getSortString() break; default: - return $dbTable == 'pgsql' + return $driver == 'pgsql' ? new Expression('"'.$column['name'].'"') : new Expression('`'.$column['name'].'`'); break; From 85eb4777d323ef3d3fceff45310ccf066ab2541f Mon Sep 17 00:00:00 2001 From: Salvatore Scalzi Date: Fri, 27 Nov 2020 16:39:42 +0100 Subject: [PATCH 2/2] add case insensitive in global search --- src/Http/Livewire/LivewireDatatable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Http/Livewire/LivewireDatatable.php b/src/Http/Livewire/LivewireDatatable.php index e1af7319..c172fbae 100644 --- a/src/Http/Livewire/LivewireDatatable.php +++ b/src/Http/Livewire/LivewireDatatable.php @@ -715,10 +715,10 @@ public function addGlobalSearch() foreach ($this->getColumnField($i) as $column) { $query->when(is_array($column), function ($query) use ($search, $column) { foreach ($column as $col) { - $query->orWhereRaw('LOWER('.$col.') like ?', "%$search%"); + $query->orWhereRaw('LOWER('.$col.') like LOWER(?)', "%$search%"); } }, function ($query) use ($search, $column) { - $query->orWhereRaw('LOWER('.$column.') like ?', "%$search%"); + $query->orWhereRaw('LOWER('.$column.') like LOWER(?)', "%$search%"); }); } });