|
@@ -53,13 +53,13 @@ |
|
|
block discarded – undo |
|
53
|
53
|
$myQuery = clone $this->query; |
|
54
|
54
|
// if its a normal query ( no union, having and distinct word ) |
|
55
|
55
|
// replace the select with static text to improve performance |
|
56
|
|
- if (! Str::contains(Str::lower($myQuery->toSql()), ['union', 'having', 'distinct', 'order by', 'group by'])) { |
|
|
56
|
+ if (!Str::contains(Str::lower($myQuery->toSql()), ['union', 'having', 'distinct', 'order by', 'group by'])) { |
|
57
|
57
|
$row_count = $this->wrap('row_count'); |
|
58
|
58
|
$myQuery->select($this->connection->raw("'1' as {$row_count}")); |
|
59
|
59
|
} |
|
60
|
60
|
|
|
61
|
61
|
// check for select soft deleted records |
|
62
|
|
- if (! $this->withTrashed && ! $this->onlyTrashed && $this->modelUseSoftDeletes()) { |
|
|
62
|
+ if (!$this->withTrashed && !$this->onlyTrashed && $this->modelUseSoftDeletes()) { |
|
63
|
63
|
$myQuery->whereNull($myQuery->getModel()->getQualifiedDeletedAtColumn()); |
|
64
|
64
|
} |
|
65
|
65
|
|
Please login to merge, or discard this patch.