Completed
Pull Request — master (#9)
by Maksim
01:11
created
src/SubqueryMagic/Scopes/SubqueryMagicScope.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
77 77
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
78 78
              */
79
-            $builder->leftJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
79
+            $builder->leftJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
80 80
             //merge bindings from subquery
81 81
             $this->addBindings($builder, $subquery->getBindings(), 'join');
82 82
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
99 99
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
100 100
              */
101
-            $builder->rightJoin(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
101
+            $builder->rightJoin(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
102 102
             //merge bindings from subquery
103 103
             $this->addBindings($builder, $subquery->getBindings(), 'join');
104 104
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
121 121
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
122 122
              */
123
-            $builder->join(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)), $on);
123
+            $builder->join(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)), $on);
124 124
             //merge bindings from subquery
125 125
             $this->addBindings($builder, $subquery->getBindings(), 'join');
126 126
 
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
143 143
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
144 144
              */
145
-            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')');
145
+            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')');
146 146
             //merge bindings from subquery
147 147
             $this->addBindings($builder, $subquery->getBindings(), 'where');
148 148
 
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
165 165
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
166 166
              */
167
-            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')');
167
+            $builder->whereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')');
168 168
             //merge bindings from subquery
169 169
             $this->addBindings($builder, $subquery->getBindings(), 'where');
170 170
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
187 187
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
188 188
              */
189
-            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' IN ('.$subquery->toSql().')');
189
+            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' IN (' . $subquery->toSql() . ')');
190 190
             //merge bindings from subquery
191 191
             $this->addBindings($builder, $subquery->getBindings(), 'where');
192 192
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
209 209
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
210 210
              */
211
-            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field).' NOT IN ('.$subquery->toSql().')');
211
+            $builder->orWhereRaw($builder->getQuery()->getGrammar()->wrap($field) . ' NOT IN (' . $subquery->toSql() . ')');
212 212
             //merge bindings from subquery
213 213
             $this->addBindings($builder, $subquery->getBindings(), 'where');
214 214
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
              * @var $builder \Illuminate\Database\Eloquent\Builder|Relation
231 231
              * @var $subquery \Illuminate\Database\Eloquent\Builder|Relation
232 232
              */
233
-            $builder->from(DB::raw('('.$subquery->toSql().') '.$builder->getQuery()->getGrammar()->wrap($alias)));
233
+            $builder->from(DB::raw('(' . $subquery->toSql() . ') ' . $builder->getQuery()->getGrammar()->wrap($alias)));
234 234
             //merge bindings from subquery
235 235
             $builder->setBindings(array_merge($subquery->getBindings(), $builder->getBindings()));
236 236
 
Please login to merge, or discard this patch.