Fix search join (#1705)

* Fix search join * fix search join
edwinheij · Oct 1, 2024 · 98690cd · 98690cd
1 parent 36fa962
commit 98690cd
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/DataSource/Builder.php b/src/DataSource/Builder.php
@@ -156,21 +156,26 @@ public function filterContains(): Builder
                                 $query->orWhereRaw($sqlRaw . ' ' . Sql::like($query) . ' ?', ["%{$search}%"]);
                             }
 
-                            if ($hasColumn && blank(data_get($column, 'searchableRaw'))) {
-                                try {
+                            try {
+                                if ($hasColumn && blank(data_get($column, 'searchableRaw'))) {
                                     $columnType = $this->getColumnType($table, $field);
 
-                                    /** @phpstan-ignore-next-line  */
+                                    /** @phpstan-ignore-next-line */
                                     $driverName = $query->getConnection()->getConfig('driver');
 
                                     if ($columnType === 'json' && strtolower($driverName) !== 'pgsql') {
                                         $query->orWhereRaw("LOWER(`{$table}`.`{$field}`)" . Sql::like($query) . ' ?', ["%{$search}%"]);
                                     } else {
                                         $query->orWhere("{$table}.{$field}", Sql::like($query), "%{$search}%");
                                     }
-                                } catch (\Throwable) {
-                                    $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}%")
+                                    );
                             }
                         });
                     });