@@ -450,7 +450,7 @@ |
||
| 450 | 450 | /** |
| 451 | 451 | * Prepare count query builder. |
| 452 | 452 | * |
| 453 | - * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder |
|
| 453 | + * @return string |
|
| 454 | 454 | */ |
| 455 | 455 | protected function prepareCountQuery() |
| 456 | 456 | { |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | switch ($this->connection->getDriverName()) { |
| 612 | 612 | case 'oracle': |
| 613 | 613 | $sql = !$this->config |
| 614 | - ->isCaseInsensitive() ? 'REGEXP_LIKE( ' . $column . ' , ? )' : 'REGEXP_LIKE( LOWER(' . $column . ') , ?, \'i\' )'; |
|
| 614 | + ->isCaseInsensitive() ? 'REGEXP_LIKE( ' . $column . ' , ? )' : 'REGEXP_LIKE( LOWER(' . $column . ') , ?, \'i\' )'; |
|
| 615 | 615 | break; |
| 616 | 616 | |
| 617 | 617 | case 'pgsql': |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | |
| 621 | 621 | default: |
| 622 | 622 | $sql = !$this->config |
| 623 | - ->isCaseInsensitive() ? $column . ' REGEXP ?' : 'LOWER(' . $column . ') REGEXP ?'; |
|
| 623 | + ->isCaseInsensitive() ? $column . ' REGEXP ?' : 'LOWER(' . $column . ') REGEXP ?'; |
|
| 624 | 624 | $keyword = Str::lower($keyword); |
| 625 | 625 | } |
| 626 | 626 | |
@@ -197,7 +197,7 @@ |
||
| 197 | 197 | /** |
| 198 | 198 | * Add relation query on global search. |
| 199 | 199 | * |
| 200 | - * @param mixed $query |
|
| 200 | + * @param Builder $query |
|
| 201 | 201 | * @param string $relation |
| 202 | 202 | * @param string $column |
| 203 | 203 | * @param string $keyword |
@@ -33,7 +33,6 @@ |
||
| 33 | 33 | * CollectionEngine constructor. |
| 34 | 34 | * |
| 35 | 35 | * @param \Illuminate\Support\Collection $collection |
| 36 | - * @param \Yajra\Datatables\Request $request |
|
| 37 | 36 | */ |
| 38 | 37 | public function __construct(Collection $collection) |
| 39 | 38 | { |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | }); |
| 64 | 64 | |
| 65 | 65 | $this->app->alias('datatables', Datatables::class); |
| 66 | - $this->app->singleton('datatables', function() { |
|
| 66 | + $this->app->singleton('datatables', function () { |
|
| 67 | 67 | return new Datatables(app('datatables.request')); |
| 68 | 68 | }); |
| 69 | 69 | |