@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | } |
185 | 185 | if($this->isTheFirst){ |
186 | 186 | WhereImpl::where($this->context, 'HAVING', $expr, array_slice(func_get_args(), 1)); |
187 | - }else{ |
|
187 | + } else{ |
|
188 | 188 | WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1)); |
189 | 189 | } |
190 | 190 | |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | } |
274 | 274 | if($this->isTheFirst){ |
275 | 275 | WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1)); |
276 | - }else{ |
|
276 | + } else{ |
|
277 | 277 | WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1)); |
278 | 278 | } |
279 | 279 | return new WhereRule($this->context, false); |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | if($this->isTheFirst){ |
107 | 107 | WhereImpl::where($this->context, 'WHERE' ,$conditions, array_slice(func_get_args(), 1)); |
108 | - }else{ |
|
108 | + } else{ |
|
109 | 109 | WhereImpl::where($this->context, 'AND', $conditions, array_slice(func_get_args(), 1)); |
110 | 110 | } |
111 | 111 | return new WhereRule($this->context, false); |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | if($this->isTheFirst){ |
168 | 168 | WhereImpl::where($this->context, '', $expr, array_slice(func_get_args(), 1)); |
169 | - }else{ |
|
169 | + } else{ |
|
170 | 170 | WhereImpl::where($this->context, 'AND', $expr, array_slice(func_get_args(), 1)); |
171 | 171 | } |
172 | 172 | return new SubQuery($this->context, false); |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | if($tables instanceof BasicRule){ |
53 | 53 | $context->appendSql("FROM (".$tables->context->sql.')'); |
54 | 54 | $context->params = array_merge($context->params,$tables->context->params); |
55 | - }else { |
|
55 | + } else { |
|
56 | 56 | $context->appendSql("FROM ".DB::wrap($tables)); |
57 | 57 | } |
58 | 58 | if($as){ |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $table = DB::wrap($table); |
76 | 76 | if($type){ |
77 | 77 | $context->appendSql("$type JOIN $table"); |
78 | - }else{ |
|
78 | + } else{ |
|
79 | 79 | $context->appendSql("JOIN $table"); |
80 | 80 | } |
81 | 81 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | foreach ($values as $v){ |
126 | 126 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
127 | 127 | $stubs[]=$v->get(); |
128 | - }else{ |
|
128 | + } else{ |
|
129 | 129 | $stubs[]='?'; |
130 | 130 | $params[] = $v; |
131 | 131 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | //VALUES(val0, val1, val2) |
137 | 137 | $context->appendSql("VALUES($stubs)"); |
138 | 138 | |
139 | - }else{ |
|
139 | + } else{ |
|
140 | 140 | //(col0, col1, col2) VALUES(val0, val1, val2) |
141 | 141 | $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values))); |
142 | 142 | $context->appendSql("($columns) VALUES($stubs)",false); |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | public function set(Context $context, $expr, $args){ |
160 | 160 | if(is_string($expr)){ |
161 | 161 | return $this->setExpr($context, $expr, $args); |
162 | - }else{ |
|
162 | + } else{ |
|
163 | 163 | return $this->setArgs($context, $expr); |
164 | 164 | } |
165 | 165 | } |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | if($this->first){ |
169 | 169 | $this->first = false; |
170 | 170 | $prefix = 'SET '; |
171 | - }else{ |
|
171 | + } else{ |
|
172 | 172 | $prefix = ','; |
173 | 173 | } |
174 | 174 | |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $k = DB::wrap($k); |
184 | 184 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
185 | 185 | $set[]= "$k=".$v->get(); |
186 | - }else{ |
|
186 | + } else{ |
|
187 | 187 | $set[]= "$k=?"; |
188 | 188 | $params[]=$v; |
189 | 189 | } |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $this->first = false; |
193 | 193 | $context->appendSql('SET '.implode(',', $set)); |
194 | 194 | $context->appendParams($params); |
195 | - }else{ |
|
195 | + } else{ |
|
196 | 196 | $context->appendSql(','.implode(',', $set),false); |
197 | 197 | $context->appendParams($params); |
198 | 198 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | foreach ($orders as $k=>$v){ |
210 | 210 | if(is_integer($k)){ |
211 | 211 | $params[] = DB::wrap($v); |
212 | - }else{ |
|
212 | + } else{ |
|
213 | 213 | $k = DB::wrap($k); |
214 | 214 | |
215 | 215 | $v = strtoupper($v); |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | if($this->first){ |
222 | 222 | $this->first = false; |
223 | 223 | $context->appendSql('ORDER BY '.implode(',', $params)); |
224 | - }else{ |
|
224 | + } else{ |
|
225 | 225 | $context->appendSql(','.implode(',', $params),false); |
226 | 226 | } |
227 | 227 | return $this; |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | if(is_string($column)){ |
231 | 231 | if($order === null){ |
232 | 232 | $column = [$column]; |
233 | - }else{ |
|
233 | + } else{ |
|
234 | 234 | $column = [$column=>$order]; |
235 | 235 | } |
236 | 236 | } |
@@ -274,9 +274,9 @@ discard block |
||
274 | 274 | } |
275 | 275 | if(is_callable($expr)){ |
276 | 276 | self::conditionClosure($context,$prefix, $expr); |
277 | - }elseif (is_string($expr)){ |
|
277 | + } elseif (is_string($expr)){ |
|
278 | 278 | self::condition($context, $prefix, $expr, $args); |
279 | - }else{ |
|
279 | + } else{ |
|
280 | 280 | self::conditionArgs($context, $prefix, $expr); |
281 | 281 | } |
282 | 282 | |
@@ -330,41 +330,41 @@ discard block |
||
330 | 330 | foreach ($var as $i){ |
331 | 331 | if(is_a($i, Raw::class)){ |
332 | 332 | $stubs[]=strval($i); |
333 | - }else{ |
|
333 | + } else{ |
|
334 | 334 | $stubs[]='?'; |
335 | 335 | $params[] = $i; |
336 | 336 | } |
337 | 337 | } |
338 | 338 | $stubs = implode(',', $stubs); |
339 | 339 | $exprs[] = "$k $op ($stubs)"; |
340 | - }else if($op == 'BETWEEN'){ |
|
340 | + } else if($op == 'BETWEEN'){ |
|
341 | 341 | $cond = "$k BETWEEN"; |
342 | 342 | if(is_a($var[0], Raw::class)){ |
343 | 343 | $cond = "$cond ".strval($var[0]); |
344 | - }else{ |
|
344 | + } else{ |
|
345 | 345 | $cond = "$cond ?"; |
346 | 346 | $params[] = $var[0]; |
347 | 347 | } |
348 | 348 | if(is_a($var[1], Raw::class)){ |
349 | 349 | $cond = "$cond AND ".strval($var[1]); |
350 | - }else{ |
|
350 | + } else{ |
|
351 | 351 | $cond = "$cond AND ?"; |
352 | 352 | $params[] = $var[1]; |
353 | 353 | } |
354 | 354 | $exprs[] = $cond; |
355 | - }else{ |
|
355 | + } else{ |
|
356 | 356 | if(is_a($var, Raw::class)){ |
357 | 357 | $exprs[] = "$k $op ".strval($var); |
358 | - }else{ |
|
358 | + } else{ |
|
359 | 359 | $exprs[] = "$k $op ?"; |
360 | 360 | $params[] = $var; |
361 | 361 | } |
362 | 362 | } |
363 | - }else{ |
|
363 | + } else{ |
|
364 | 364 | if(is_a($v, Raw::class)){ |
365 | 365 | $exprs[] = "$k = ".strval($v); |
366 | 366 | |
367 | - }else{ |
|
367 | + } else{ |
|
368 | 368 | $exprs[] = "$k = ?"; |
369 | 369 | $params[] = $v; |
370 | 370 | } |
@@ -402,18 +402,18 @@ discard block |
||
402 | 402 | foreach ($arg as $i){ |
403 | 403 | if(is_a($i, Raw::class)){ |
404 | 404 | $stubs[] = strval($i); |
405 | - }else{ |
|
405 | + } else{ |
|
406 | 406 | $stubs[] = '?'; |
407 | 407 | $newArgs[] = $i; |
408 | 408 | } |
409 | 409 | } |
410 | 410 | $stubs = implode(',', $stubs); |
411 | - }else{ |
|
411 | + } else{ |
|
412 | 412 | $stubs = strval($arg); |
413 | 413 | } |
414 | 414 | $toReplace[] = [$pos, $stubs]; |
415 | 415 | |
416 | - }else{ |
|
416 | + } else{ |
|
417 | 417 | $newArgs[]=$arg; |
418 | 418 | } |
419 | 419 | } |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | } |
430 | 430 | if($prefix){ |
431 | 431 | $context->appendSql($prefix.' '.$expr); |
432 | - }else{ |
|
432 | + } else{ |
|
433 | 433 | $context->appendSql($expr); |
434 | 434 | } |
435 | 435 | |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | return $context->handleResult($dict); |
480 | 480 | } |
481 | 481 | return $context->handleResult($res); |
482 | - }else{ |
|
482 | + } else{ |
|
483 | 483 | return false; |
484 | 484 | } |
485 | 485 | } |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) || |
504 | 504 | count($found)==0){ |
505 | 505 | $columnEnd = strlen($context->sql); |
506 | - }else{ |
|
506 | + } else{ |
|
507 | 507 | list($chars, $columnEnd) = $found[0]; |
508 | 508 | } |
509 | 509 | $sql = substr($context->sql, 0, $columnBegin); |
@@ -514,7 +514,7 @@ discard block |
||
514 | 514 | if($st->execute($context->params)){ |
515 | 515 | $res = $st->fetchAll(\PDO::FETCH_ASSOC); |
516 | 516 | return $res[0]['count']; |
517 | - }else{ |
|
517 | + } else{ |
|
518 | 518 | return false; |
519 | 519 | } |
520 | 520 | |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | public function set($context, $column, $value){ |
526 | 526 | if(is_string($column)){ |
527 | 527 | $this->setExpr($context, $column, $value); |
528 | - }else{ |
|
528 | + } else{ |
|
529 | 529 | $this->setArgs($context, $column); |
530 | 530 | } |
531 | 531 | } |
@@ -535,7 +535,7 @@ discard block |
||
535 | 535 | if($this->first){ |
536 | 536 | $this->first = false; |
537 | 537 | $prefix = 'ON DUPLICATE KEY UPDATE '; |
538 | - }else{ |
|
538 | + } else{ |
|
539 | 539 | $prefix = ','; |
540 | 540 | } |
541 | 541 | |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | $k = DB::wrap($k); |
551 | 551 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
552 | 552 | $set[]= "$k=".$v->get(); |
553 | - }else{ |
|
553 | + } else{ |
|
554 | 554 | $set[]= "$k=?"; |
555 | 555 | $params[]=$v; |
556 | 556 | } |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | $this->first = false; |
560 | 560 | $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set)); |
561 | 561 | $context->appendParams($params); |
562 | - }else{ |
|
562 | + } else{ |
|
563 | 563 | $context->appendSql(','.implode(',', $set),false); |
564 | 564 | $context->appendParams($params); |
565 | 565 | } |