|
@@ -197,7 +197,7 @@ discard block |
|
|
block discarded – undo |
|
197
|
197
|
|
|
198
|
198
|
$this->query->addSelect($columns); |
|
199
|
199
|
|
|
200
|
|
- return tap($this->query->paginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
200
|
+ return tap($this->query->paginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
201
|
201
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
202
|
202
|
}); |
|
203
|
203
|
} |
|
@@ -219,7 +219,7 @@ discard block |
|
|
block discarded – undo |
|
219
|
219
|
|
|
220
|
220
|
$this->query->addSelect($columns); |
|
221
|
221
|
|
|
222
|
|
- return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function (Paginator $paginator) { |
|
|
222
|
+ return tap($this->query->simplePaginate($perPage, $columns, $pageName, $page), function(Paginator $paginator) { |
|
223
|
223
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
224
|
224
|
}); |
|
225
|
225
|
} |
|
@@ -241,7 +241,7 @@ discard block |
|
|
block discarded – undo |
|
241
|
241
|
|
|
242
|
242
|
$this->query->addSelect($columns); |
|
243
|
243
|
|
|
244
|
|
- return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function (CursorPaginator $paginator) { |
|
|
244
|
+ return tap($this->query->cursorPaginate($perPage, $columns, $cursorName, $cursor), function(CursorPaginator $paginator) { |
|
245
|
245
|
$this->hydrateIntermediateRelations($paginator->items()); |
|
246
|
246
|
}); |
|
247
|
247
|
} |
|
@@ -266,7 +266,7 @@ discard block |
|
|
block discarded – undo |
|
266
|
266
|
*/ |
|
267
|
267
|
public function chunk($count, callable $callback) |
|
268
|
268
|
{ |
|
269
|
|
- return $this->prepareQueryBuilder()->chunk($count, function (Collection $results) use ($callback) { |
|
|
269
|
+ return $this->prepareQueryBuilder()->chunk($count, function(Collection $results) use ($callback) { |
|
270
|
270
|
$this->hydrateIntermediateRelations($results->all()); |
|
271
|
271
|
|
|
272
|
272
|
return $callback($results); |
|
@@ -336,7 +336,7 @@ discard block |
|
|
block discarded – undo |
|
336
|
336
|
} |
|
337
|
337
|
|
|
338
|
338
|
$this->query->getQuery()->wheres = collect($this->query->getQuery()->wheres) |
|
339
|
|
- ->reject(function ($where) use ($columns) { |
|
|
339
|
+ ->reject(function($where) use ($columns) { |
|
340
|
340
|
return $where['type'] === 'Null' && in_array($where['column'], $columns); |
|
341
|
341
|
})->values()->all(); |
|
342
|
342
|
|