| @@ 166-178 (lines=13) @@ | ||
| 163 | continue; |
|
| 164 | } |
|
| 165 | ||
| 166 | if ($columnDef['method'] instanceof Closure) { |
|
| 167 | $whereQuery = $queryBuilder->newQuery(); |
|
| 168 | call_user_func_array($columnDef['method'], [$whereQuery, $globalKeyword]); |
|
| 169 | $queryBuilder->addNestedWhereQuery($whereQuery, 'or'); |
|
| 170 | } else { |
|
| 171 | $this->compileColumnQuery( |
|
| 172 | $queryBuilder, |
|
| 173 | Helper::getOrMethod($columnDef['method']), |
|
| 174 | $columnDef['parameters'], |
|
| 175 | $columnName, |
|
| 176 | $globalKeyword |
|
| 177 | ); |
|
| 178 | } |
|
| 179 | } else { |
|
| 180 | if (count(explode('.', $columnName)) > 1) { |
|
| 181 | $eagerLoads = $this->getEagerLoads(); |
|
| @@ 452-464 (lines=13) @@ | ||
| 449 | $keyword = $this->getSearchKeyword($index, true); |
|
| 450 | $builder = $this->getQueryBuilder(); |
|
| 451 | ||
| 452 | if ($columnDef['method'] instanceof Closure) { |
|
| 453 | $whereQuery = $builder->newQuery(); |
|
| 454 | call_user_func_array($columnDef['method'], [$whereQuery, $keyword]); |
|
| 455 | $builder->addNestedWhereQuery($whereQuery); |
|
| 456 | } else { |
|
| 457 | $this->compileColumnQuery( |
|
| 458 | $builder, |
|
| 459 | $columnDef['method'], |
|
| 460 | $columnDef['parameters'], |
|
| 461 | $column, |
|
| 462 | $keyword |
|
| 463 | ); |
|
| 464 | } |
|
| 465 | } else { |
|
| 466 | if (count(explode('.', $column)) > 1) { |
|
| 467 | $eagerLoads = $this->getEagerLoads(); |
|