Fix relation search (#1754)

Power-Components · Nov 6, 2024 · 703913b · 703913b
1 parent 75693ea
commit 703913b
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/DataSource/Builder.php b/src/DataSource/Builder.php
@@ -152,11 +152,20 @@ public function filterContains(): Builder
 
                     $hasColumn = isset($columnList[$field]);
 
-                    $query->when(
-                        $hasColumn && $table,
-                        fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
-                        fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere($field, Sql::like($query), "%{$search}%")
-                    );
+                    try {
+                        $query
+                            ->when(
+                                $hasColumn && $table,
+                                fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
+                            );
+                    } catch (\Throwable) {
+                        $query
+                            ->when(
+                                $table,
+                                fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%"),
+                                fn (EloquentBuilder|QueryBuilder $query) => $query->orWhere($field, Sql::like($query), "%{$search}%")
+                            );
+                    }
                 });
 
             return $query;