Skip to content

Commit

Permalink
[FIX] SQL Binding on searchableRaw() (#1573)
Browse files Browse the repository at this point in the history
* Fix binding on searchableRaw

* add link on header
  • Loading branch information
dansysanalyst committed May 27, 2024
1 parent 71ba833 commit 9593691
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div align="center">
<p><img src="art/header.jpg" alt="PowerGrid Logo"></p>
<p><a href="https://livewire-powergrid.com" target="_blank"><img src="art/header.jpg" alt="PowerGrid Logo"></a></p>
<p align="center">
<a href="https://packagist.org/packages/power-components/livewire-powergrid"><img alt="Latest Version" src="https://img.shields.io/static/v1?label=laravel&message=%E2%89%A510.0&color=0078BE&logo=laravel&style=flat-square"></a>
<a href="https://packagist.org/packages/power-components/livewire-powergrid"><img alt="Total Downloads" src="https://img.shields.io/packagist/dt/power-components/livewire-powergrid"></a>
Expand Down
4 changes: 2 additions & 2 deletions src/DataSource/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function filterContains(): Builder

$query->when($search != '', function () use ($column, $query, $search, $table, $field, $hasColumn) {
if (($sqlRaw = strval(data_get($column, 'searchableRaw')))) {
$query->orWhereRaw($sqlRaw . ' ' . Sql::like($query) . ' \'%' . $search . '%\'');
$query->orWhereRaw($sqlRaw . ' ' . Sql::like($query) . ' ?', ["%{$search}%"]);
}

if ($hasColumn && blank(data_get($column, 'searchableRaw'))) {
Expand All @@ -164,7 +164,7 @@ public function filterContains(): Builder
$driverName = $query->getConnection()->getConfig('driver');

if ($columnType === 'json' && strtolower($driverName) !== 'pgsql') {
$query->orWhereRaw("LOWER(`{$table}`.`{$field}`)" . Sql::like($query) . "?", '%' . $search . '%');
$query->orWhereRaw("LOWER(`{$table}`.`{$field}`)" . Sql::like($query) . ' ?', ["%{$search}%"]);
} else {
$query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%");
}
Expand Down

0 comments on commit 9593691

Please sign in to comment.