@@ -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 | |
@@ -335,14 +335,14 @@ discard block |
||
335 | 335 | $stubs = "({$var->context->sql})"; |
336 | 336 | $params = array_merge($params, $var->context->params); |
337 | 337 | $exprs[] = "$k $op $stubs"; |
338 | - }else{ |
|
338 | + } else{ |
|
339 | 339 | foreach ($var as $i){ |
340 | 340 | if(is_a($i, Raw::class)){ |
341 | 341 | $stubs[]=strval($i); |
342 | - }elseif($i instanceof BasicRule){ |
|
342 | + } elseif($i instanceof BasicRule){ |
|
343 | 343 | $stubs = "({$i->context->sql})"; |
344 | 344 | $params = array_merge($params, $i->context->params); |
345 | - }else{ |
|
345 | + } else{ |
|
346 | 346 | $stubs[]='?'; |
347 | 347 | $params[] = $i; |
348 | 348 | } |
@@ -350,34 +350,34 @@ discard block |
||
350 | 350 | $stubs = implode(',', $stubs); |
351 | 351 | $exprs[] = "$k $op ($stubs)"; |
352 | 352 | } |
353 | - }else if($op == 'BETWEEN'){ |
|
353 | + } else if($op == 'BETWEEN'){ |
|
354 | 354 | $cond = "$k BETWEEN"; |
355 | 355 | if(is_a($var[0], Raw::class)){ |
356 | 356 | $cond = "$cond ".strval($var[0]); |
357 | - }elseif($var[0] instanceof BasicRule){ |
|
357 | + } elseif($var[0] instanceof BasicRule){ |
|
358 | 358 | $cond = "$cond ({$var[0]->context->sql})"; |
359 | 359 | $params = array_merge($params, $var[0]->context->params); |
360 | - }else{ |
|
360 | + } else{ |
|
361 | 361 | $cond = "$cond ?"; |
362 | 362 | $params[] = $var[0]; |
363 | 363 | } |
364 | 364 | if(is_a($var[1], Raw::class)){ |
365 | 365 | $cond = "$cond AND ".strval($var[1]); |
366 | - }elseif($var[1] instanceof BasicRule){ |
|
366 | + } elseif($var[1] instanceof BasicRule){ |
|
367 | 367 | $cond = "$cond AND ({$var[1]->context->sql})"; |
368 | 368 | $params = array_merge($params, $var[1]->context->params); |
369 | - }else{ |
|
369 | + } else{ |
|
370 | 370 | $cond = "$cond AND ?"; |
371 | 371 | $params[] = $var[1]; |
372 | 372 | } |
373 | 373 | $exprs[] = $cond; |
374 | - }else{ |
|
374 | + } else{ |
|
375 | 375 | if(is_a($var, Raw::class)){ |
376 | 376 | $exprs[] = "$k $op ".strval($var); |
377 | - }elseif($var instanceof BasicRule){ |
|
377 | + } elseif($var instanceof BasicRule){ |
|
378 | 378 | $exprs[] = "$k $op {$var->context->sql}"; |
379 | 379 | $params = array_merge($params, $var->context->params); |
380 | - }else{ |
|
380 | + } else{ |
|
381 | 381 | $exprs[] = "$k $op ?"; |
382 | 382 | $params[] = $var; |
383 | 383 | } |
@@ -416,21 +416,21 @@ discard block |
||
416 | 416 | foreach ($arg as $i){ |
417 | 417 | if(is_a($i, Raw::class)){ |
418 | 418 | $stubs[] = strval($i); |
419 | - }else{ |
|
419 | + } else{ |
|
420 | 420 | $stubs[] = '?'; |
421 | 421 | $newArgs[] = $i; |
422 | 422 | } |
423 | 423 | } |
424 | 424 | $stubs = implode(',', $stubs); |
425 | - }elseif($arg instanceof BasicRule){ |
|
425 | + } elseif($arg instanceof BasicRule){ |
|
426 | 426 | $stubs = "({$arg->context->sql})"; |
427 | 427 | $newArgs = array_merge($newArgs, $arg->context->params); |
428 | - }else{ |
|
428 | + } else{ |
|
429 | 429 | $stubs = strval($arg); |
430 | 430 | } |
431 | 431 | $toReplace[] = [$pos, $stubs]; |
432 | 432 | |
433 | - }else{ |
|
433 | + } else{ |
|
434 | 434 | $newArgs[]=$arg; |
435 | 435 | } |
436 | 436 | } |
@@ -446,7 +446,7 @@ discard block |
||
446 | 446 | } |
447 | 447 | if($prefix){ |
448 | 448 | $context->appendSql($prefix.' '.$expr); |
449 | - }else{ |
|
449 | + } else{ |
|
450 | 450 | $context->appendSql($expr); |
451 | 451 | } |
452 | 452 | |
@@ -496,7 +496,7 @@ discard block |
||
496 | 496 | return $context->handleResult($dict); |
497 | 497 | } |
498 | 498 | return $context->handleResult($res); |
499 | - }else{ |
|
499 | + } else{ |
|
500 | 500 | return false; |
501 | 501 | } |
502 | 502 | } |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) || |
521 | 521 | count($found)==0){ |
522 | 522 | $columnEnd = strlen($context->sql); |
523 | - }else{ |
|
523 | + } else{ |
|
524 | 524 | list($chars, $columnEnd) = $found[0]; |
525 | 525 | } |
526 | 526 | $sql = substr($context->sql, 0, $columnBegin); |
@@ -531,7 +531,7 @@ discard block |
||
531 | 531 | if($st->execute($context->params)){ |
532 | 532 | $res = $st->fetchAll(\PDO::FETCH_ASSOC); |
533 | 533 | return intval($res[0]['count']); |
534 | - }else{ |
|
534 | + } else{ |
|
535 | 535 | return false; |
536 | 536 | } |
537 | 537 | |
@@ -542,7 +542,7 @@ discard block |
||
542 | 542 | public function set($context, $column, $value){ |
543 | 543 | if(is_string($column)){ |
544 | 544 | $this->setExpr($context, $column, $value); |
545 | - }else{ |
|
545 | + } else{ |
|
546 | 546 | $this->setArgs($context, $column); |
547 | 547 | } |
548 | 548 | } |
@@ -552,7 +552,7 @@ discard block |
||
552 | 552 | if($this->first){ |
553 | 553 | $this->first = false; |
554 | 554 | $prefix = 'ON DUPLICATE KEY UPDATE '; |
555 | - }else{ |
|
555 | + } else{ |
|
556 | 556 | $prefix = ','; |
557 | 557 | } |
558 | 558 | |
@@ -567,7 +567,7 @@ discard block |
||
567 | 567 | $k = DB::wrap($k); |
568 | 568 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
569 | 569 | $set[]= "$k=".$v->get(); |
570 | - }else{ |
|
570 | + } else{ |
|
571 | 571 | $set[]= "$k=?"; |
572 | 572 | $params[]=$v; |
573 | 573 | } |
@@ -576,7 +576,7 @@ discard block |
||
576 | 576 | $this->first = false; |
577 | 577 | $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set)); |
578 | 578 | $context->appendParams($params); |
579 | - }else{ |
|
579 | + } else{ |
|
580 | 580 | $context->appendSql(','.implode(',', $set),false); |
581 | 581 | $context->appendParams($params); |
582 | 582 | } |