Skip to content

Commit 703913b

Browse files
Fix relation search (#1754)
1 parent 75693ea commit 703913b

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

src/DataSource/Builder.php

+14-5
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,20 @@ public function filterContains(): Builder
152152

153153
$hasColumn = isset($columnList[$field]);
154154

155-
$query->when(
156-
$hasColumn && $table,
157-
fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
158-
fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere($field, Sql::like($query), "%{$search}%")
159-
);
155+
try {
156+
$query
157+
->when(
158+
$hasColumn && $table,
159+
fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
160+
);
161+
} catch (\Throwable) {
162+
$query
163+
->when(
164+
$table,
165+
fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
166+
fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere($field, Sql::like($query), "%{$search}%")
167+
);
168+
}
160169
});
161170

162171
return $query;

0 commit comments

Comments
 (0)