@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | protected function addLeftJoinSubquery(Builder $builder) |
62 | 62 | { |
63 | 63 | $builder->macro('leftJoinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) { |
64 | - $builder->leftJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
64 | + $builder->leftJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
65 | 65 | //merge bindings from subquery |
66 | 66 | $this->addBindings($builder, $subquery->getBindings()); |
67 | 67 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | protected function addRightJoinSubquery(Builder $builder) |
85 | 85 | { |
86 | 86 | $builder->macro('rightJoinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) { |
87 | - $builder->rightJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
87 | + $builder->rightJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
88 | 88 | //merge bindings from subquery |
89 | 89 | $this->addBindings($builder, $subquery->getBindings()); |
90 | 90 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | protected function addJoinSubquery(Builder $builder) |
103 | 103 | { |
104 | 104 | $builder->macro('joinSubquery', function (Builder $builder, Builder $subquery, $alias, \Closure $on) { |
105 | - $builder->join(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
105 | + $builder->join(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on); |
|
106 | 106 | //merge bindings from subquery |
107 | 107 | $this->addBindings($builder, $subquery->getBindings()); |
108 | 108 | |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | protected function addWhereInSubquery(Builder $builder) |
121 | 121 | { |
122 | 122 | $builder->macro('whereInSubquery', function (Builder $builder, $field, Builder $subquery) { |
123 | - $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')'); |
|
123 | + $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')'); |
|
124 | 124 | //merge bindings from subquery |
125 | 125 | $this->addBindings($builder, $subquery->getBindings()); |
126 | 126 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | protected function addWhereNotInSubquery(Builder $builder) |
139 | 139 | { |
140 | 140 | $builder->macro('whereNotInSubquery', function (Builder $builder, $field, Builder $subquery) { |
141 | - $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')'); |
|
141 | + $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')'); |
|
142 | 142 | //merge bindings from subquery |
143 | 143 | $this->addBindings($builder, $subquery->getBindings()); |
144 | 144 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | protected function addOrWhereInSubquery(Builder $builder) |
157 | 157 | { |
158 | 158 | $builder->macro('orWhereInSubquery', function (Builder $builder, $field, Builder $subquery) { |
159 | - $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')'); |
|
159 | + $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')'); |
|
160 | 160 | //merge bindings from subquery |
161 | 161 | $this->addBindings($builder, $subquery->getBindings()); |
162 | 162 | |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | protected function addOrWhereNotInSubquery(Builder $builder) |
175 | 175 | { |
176 | 176 | $builder->macro('orWhereNotInSubquery', function (Builder $builder, $field, Builder $subquery) { |
177 | - $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')'); |
|
177 | + $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')'); |
|
178 | 178 | //merge bindings from subquery |
179 | 179 | $this->addBindings($builder, $subquery->getBindings()); |
180 | 180 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | protected function addFromSubquery(Builder $builder) |
193 | 193 | { |
194 | 194 | $builder->macro('fromSubquery', function (Builder $builder, Builder $subquery, $alias) { |
195 | - $builder->from(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias))); |
|
195 | + $builder->from(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias))); |
|
196 | 196 | //merge bindings from subquery |
197 | 197 | $builder->setBindings(array_merge($subquery->getBindings(), $builder->getBindings())); |
198 | 198 |