@@ -184,6 +184,9 @@ |
||
184 | 184 | return $table . '.' . $relationColumn; |
185 | 185 | } |
186 | 186 | |
187 | + /** |
|
188 | + * @return false|string |
|
189 | + */ |
|
187 | 190 | protected function checkSoftDeletesOnModel($model) |
188 | 191 | { |
189 | 192 | if (in_array('Illuminate\Database\Eloquent\SoftDeletes', class_uses($model))) { |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function prepareQuery() |
114 | 114 | { |
115 | - if (! $this->prepared) { |
|
115 | + if (!$this->prepared) { |
|
116 | 116 | $this->totalRecords = $this->totalCount(); |
117 | 117 | |
118 | 118 | if ($this->totalRecords) { |
@@ -203,10 +203,10 @@ discard block |
||
203 | 203 | { |
204 | 204 | $builder = clone $this->query; |
205 | 205 | |
206 | - if (! $this->isComplexQuery($builder)) { |
|
206 | + if (!$this->isComplexQuery($builder)) { |
|
207 | 207 | $row_count = $this->wrap('row_count'); |
208 | 208 | $builder->select($this->connection->raw("'1' as {$row_count}")); |
209 | - if (! $this->keepSelectBindings) { |
|
209 | + if (!$this->keepSelectBindings) { |
|
210 | 210 | $builder->setBindings([], 'select'); |
211 | 211 | } |
212 | 212 | } |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | foreach ($columns as $index => $column) { |
281 | 281 | $column = $this->getColumnName($index); |
282 | 282 | |
283 | - if (! $this->request->isColumnSearchable($index) || $this->isBlacklisted($column)) { |
|
283 | + if (!$this->request->isColumnSearchable($index) || $this->isBlacklisted($column)) { |
|
284 | 284 | continue; |
285 | 285 | } |
286 | 286 | |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | */ |
358 | 358 | protected function getBaseQueryBuilder($instance = null) |
359 | 359 | { |
360 | - if (! $instance) { |
|
360 | + if (!$instance) { |
|
361 | 361 | $instance = $this->query; |
362 | 362 | } |
363 | 363 | |
@@ -406,18 +406,18 @@ discard block |
||
406 | 406 | { |
407 | 407 | switch ($this->connection->getDriverName()) { |
408 | 408 | case 'oracle': |
409 | - $sql = ! $this->config->isCaseInsensitive() |
|
409 | + $sql = !$this->config->isCaseInsensitive() |
|
410 | 410 | ? 'REGEXP_LIKE( ' . $column . ' , ? )' |
411 | 411 | : 'REGEXP_LIKE( LOWER(' . $column . ') , ?, \'i\' )'; |
412 | 412 | break; |
413 | 413 | |
414 | 414 | case 'pgsql': |
415 | 415 | $column = $this->castColumn($column); |
416 | - $sql = ! $this->config->isCaseInsensitive() ? $column . ' ~ ?' : $column . ' ~* ? '; |
|
416 | + $sql = !$this->config->isCaseInsensitive() ? $column . ' ~ ?' : $column . ' ~* ? '; |
|
417 | 417 | break; |
418 | 418 | |
419 | 419 | default: |
420 | - $sql = ! $this->config->isCaseInsensitive() |
|
420 | + $sql = !$this->config->isCaseInsensitive() |
|
421 | 421 | ? $column . ' REGEXP ?' |
422 | 422 | : 'LOWER(' . $column . ') REGEXP ?'; |
423 | 423 | $keyword = Str::lower($keyword); |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | { |
478 | 478 | if (strpos($column, '.') === false) { |
479 | 479 | $q = $this->getBaseQueryBuilder($query); |
480 | - if (! $q->from instanceof Expression) { |
|
480 | + if (!$q->from instanceof Expression) { |
|
481 | 481 | $column = $q->from . '.' . $column; |
482 | 482 | } |
483 | 483 | } |
@@ -634,7 +634,7 @@ discard block |
||
634 | 634 | return $orderable; |
635 | 635 | }) |
636 | 636 | ->reject(function ($orderable) { |
637 | - return $this->isBlacklisted($orderable['name']) && ! $this->hasOrderColumn($orderable['name']); |
|
637 | + return $this->isBlacklisted($orderable['name']) && !$this->hasOrderColumn($orderable['name']); |
|
638 | 638 | }) |
639 | 639 | ->each(function ($orderable) { |
640 | 640 | $column = $this->resolveRelationColumn($orderable['name']); |
@@ -702,7 +702,7 @@ discard block |
||
702 | 702 | return $this->getColumnName($index); |
703 | 703 | }) |
704 | 704 | ->reject(function ($column) { |
705 | - return $this->isBlacklisted($column) && ! $this->hasFilterColumn($column); |
|
705 | + return $this->isBlacklisted($column) && !$this->hasFilterColumn($column); |
|
706 | 706 | }) |
707 | 707 | ->each(function ($column) use ($keyword, $query) { |
708 | 708 | if ($this->hasFilterColumn($column)) { |
@@ -100,9 +100,9 @@ discard block |
||
100 | 100 | { |
101 | 101 | $columns = $this->request->get('columns', []); |
102 | 102 | for ($i = 0, $c = count($columns); $i < $c; $i++) { |
103 | - $column = $this->getColumnName($i); |
|
103 | + $column = $this->getColumnName($i); |
|
104 | 104 | |
105 | - if (! $this->request->isColumnSearchable($i) || $this->isBlacklisted($column)) { |
|
105 | + if (!$this->request->isColumnSearchable($i) || $this->isBlacklisted($column)) { |
|
106 | 106 | continue; |
107 | 107 | } |
108 | 108 | |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | foreach ($this->request->searchableColumnIndex() as $index) { |
233 | 233 | $column = $this->getColumnName($index); |
234 | 234 | $value = Arr::get($data, $column); |
235 | - if (! $value || is_array($value)) { |
|
236 | - if (! is_numeric($value)) { |
|
235 | + if (!$value || is_array($value)) { |
|
236 | + if (!is_numeric($value)) { |
|
237 | 237 | continue; |
238 | 238 | } |
239 | 239 | |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | protected function defaultOrdering() |
257 | 257 | { |
258 | 258 | $criteria = $this->request->orderableColumns(); |
259 | - if (! empty($criteria)) { |
|
259 | + if (!empty($criteria)) { |
|
260 | 260 | $sorter = $this->getSorter($criteria); |
261 | 261 | |
262 | 262 | $this->collection = $this->collection |