@@ -119,8 +119,8 @@ |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | $subquery->select($this->model->getTable() . '.*') |
122 | - ->from($this->model->getTable()) |
|
123 | - ->groupBy($groupByColumns); |
|
122 | + ->from($this->model->getTable()) |
|
123 | + ->groupBy($groupByColumns); |
|
124 | 124 | |
125 | 125 | $this->addSearchClauses($subquery, $columns, $words, $threshold); |
126 | 126 |
@@ -108,17 +108,17 @@ discard block |
||
108 | 108 | $modelTableName = $this->model->getTable(); |
109 | 109 | |
110 | 110 | // If we are dealing with a SQL Server database, we need to group by all column names |
111 | - if ( $this->model->getConnection()->getDriverName() == 'sqlsrv' ) { |
|
111 | + if ($this->model->getConnection()->getDriverName() == 'sqlsrv') { |
|
112 | 112 | $groupByColumns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($modelTableName); |
113 | 113 | // Force column names to be fully-qualified |
114 | 114 | foreach ($groupByColumns as &$column) { |
115 | - $column = $modelTableName . '.' . $column; |
|
115 | + $column = $modelTableName.'.'.$column; |
|
116 | 116 | } |
117 | 117 | } else { |
118 | 118 | $groupByColumns = $this->model->getQualifiedKeyName(); |
119 | 119 | } |
120 | 120 | |
121 | - $subquery->select($this->model->getTable() . '.*') |
|
121 | + $subquery->select($this->model->getTable().'.*') |
|
122 | 122 | ->from($this->model->getTable()) |
123 | 123 | ->groupBy($groupByColumns); |
124 | 124 | |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | if (in_array($type, $typesToMove) && $this->model->hasColumn($where['column'])) { |
250 | 250 | unset($this->query->wheres[$key]); |
251 | 251 | |
252 | - $where['column'] = $this->model->getTable() . '.' . $where['column']; |
|
252 | + $where['column'] = $this->model->getTable().'.'.$where['column']; |
|
253 | 253 | |
254 | 254 | $subquery->getQuery()->wheres[] = $where; |
255 | 255 | |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | protected function countBindings(array $where, $type) |
281 | 281 | { |
282 | 282 | if ($this->isHasWhere($where, $type)) { |
283 | - return substr_count($where['column'] . $where['value'], '?'); |
|
283 | + return substr_count($where['column'].$where['value'], '?'); |
|
284 | 284 | |
285 | 285 | } elseif ($type === 'basic') { |
286 | 286 | return (int) !$where['value'] instanceof Expression; |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | |
334 | 334 | $operator = $this->getLikeOperator(); |
335 | 335 | |
336 | - $bindings['select'] = $bindings['where'] = array_map(function ($word) { |
|
336 | + $bindings['select'] = $bindings['where'] = array_map(function($word) { |
|
337 | 337 | return $this->caseBinding($word); |
338 | 338 | }, $words); |
339 | 339 | |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | foreach ($words as $key => $word) { |
346 | 346 | if ($this->isLeftMatching($word)) { |
347 | 347 | $leftMatching[] = sprintf('%s %s ?', $column->getWrapped(), $operator); |
348 | - $bindings['select'][] = $bindings['where'][$key] = $this->caseBinding($word) . '%'; |
|
348 | + $bindings['select'][] = $bindings['where'][$key] = $this->caseBinding($word).'%'; |
|
349 | 349 | } |
350 | 350 | } |
351 | 351 | |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | foreach ($words as $key => $word) { |
361 | 361 | if ($this->isWildcard($word)) { |
362 | 362 | $wildcards[] = sprintf('%s %s ?', $column->getWrapped(), $operator); |
363 | - $bindings['select'][] = $bindings['where'][$key] = '%'.$this->caseBinding($word) . '%'; |
|
363 | + $bindings['select'][] = $bindings['where'][$key] = '%'.$this->caseBinding($word).'%'; |
|
364 | 364 | } |
365 | 365 | } |
366 | 366 | |
@@ -489,12 +489,12 @@ discard block |
||
489 | 489 | public function prefixColumnsForJoin() |
490 | 490 | { |
491 | 491 | if (!$columns = $this->query->columns) { |
492 | - return $this->select($this->model->getTable() . '.*'); |
|
492 | + return $this->select($this->model->getTable().'.*'); |
|
493 | 493 | } |
494 | 494 | |
495 | 495 | foreach ($columns as $key => $column) { |
496 | 496 | if ($this->model->hasColumn($column)) { |
497 | - $columns[$key] = $this->model->getTable() . '.' . $column; |
|
497 | + $columns[$key] = $this->model->getTable().'.'.$column; |
|
498 | 498 | } |
499 | 499 | } |
500 | 500 |