Skip to content

Commit 9603dd8

Browse files
committed
fix
1 parent 6d42c67 commit 9603dd8

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

packages/tables/src/HasTable.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ public function getRecords()
129129
->filter(fn ($column) => $column->isSearchable())
130130
->each(function ($column, $index) use (&$query) {
131131
$search = Str::lower($this->search);
132+
$searchOperator = [
133+
'pgsql' => 'ilike',
134+
][$query->getConnection()->getDriverName()] ?? 'like';
132135

133136
$first = $index === 0;
134137

@@ -137,18 +140,18 @@ public function getRecords()
137140

138141
$query = $query->{$first ? 'whereHas' : 'orWhereHas'}(
139142
$relationship,
140-
function ($query) use ($column, $search) {
143+
function ($query) use ($column, $search, $searchOperator) {
141144
$columnName = (string) Str::of($column->name)->afterLast('.');
142145

143-
return $query->whereRaw("LOWER({$columnName}) LIKE ?", ["%{$search}%"]);
146+
return $query->where($columnName, $searchOperator, "%{$search}%");
144147
},
145148
);
146149

147150
return;
148151
}
149152

150153
$query = $query->{$first ? 'where' : 'orWhere'}(
151-
fn ($query) => $query->whereRaw("LOWER({$column->name}) LIKE ?", ["%{$search}%"]),
154+
fn ($query) => $query->where($column->name, $searchOperator, "%{$search}%"),
152155
);
153156
});
154157
}

src/Resources/Forms/Components/BelongsToSelect.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ public function relationship($relationshipName, $displayColumnName, $callback =
2828
}
2929

3030
$search = Str::lower($search);
31+
$searchOperator = [
32+
'pgsql' => 'ilike',
33+
][$query->getConnection()->getDriverName()] ?? 'like';
3134

3235
return $query
33-
->whereRaw("LOWER({$displayColumnName}) LIKE ?", ["%{$search}%"])
36+
->where($displayColumnName, $searchOperator, "%{$search}%")
3437
->pluck($displayColumnName, $relationship->getOwnerKeyName())
3538
->toArray();
3639
});

src/Resources/RelationManager/AttachRecord.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,12 @@ public function getForm()
8787
$query = $relationship->getRelated();
8888

8989
$search = Str::lower($search);
90+
$searchOperator = [
91+
'pgsql' => 'ilike',
92+
][$query->getConnection()->getDriverName()] ?? 'like';
9093

9194
return $query
92-
->whereRaw("LOWER({$this->getPrimaryColumn()}) LIKE ?", ["%{$search}%"])
95+
->where($this->getPrimaryColumn(), $searchOperator, "%{$search}%")
9396
->whereDoesntHave($this->getInverseRelationship(), function ($query) {
9497
$query->where($this->owner->getQualifiedKeyName(), $this->owner->getKey());
9598
})

0 commit comments

Comments
 (0)