@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if($tables instanceof BasicRule){ |
| 54 | 54 | $context->appendSql("FROM (".$tables->context->sql.')'); |
| 55 | 55 | $context->params = array_merge($context->params,$tables->context->params); |
| 56 | - }else { |
|
| 56 | + } else { |
|
| 57 | 57 | $context->appendSql("FROM ".DB::wrap($tables)); |
| 58 | 58 | } |
| 59 | 59 | if($as){ |
@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | $table = DB::wrap($table); |
| 77 | 77 | if($type){ |
| 78 | 78 | $context->appendSql("$type JOIN $table"); |
| 79 | - }else{ |
|
| 79 | + } else{ |
|
| 80 | 80 | $context->appendSql("JOIN $table"); |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | foreach ($values as $v){ |
| 127 | 127 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
| 128 | 128 | $stubs[]=$v->get(); |
| 129 | - }else{ |
|
| 129 | + } else{ |
|
| 130 | 130 | $stubs[]='?'; |
| 131 | 131 | $params[] = $v; |
| 132 | 132 | } |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | //VALUES(val0, val1, val2) |
| 138 | 138 | $context->appendSql("VALUES($stubs)"); |
| 139 | 139 | |
| 140 | - }else{ |
|
| 140 | + } else{ |
|
| 141 | 141 | //(col0, col1, col2) VALUES(val0, val1, val2) |
| 142 | 142 | $columns = implode(',', array_map(function($k){return DB::wrap($k);}, array_keys($values))); |
| 143 | 143 | $context->appendSql("($columns) VALUES($stubs)",false); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | if($keys === range(0, count($keys) - 1)){ |
| 156 | 156 | //VALUES(val0, val1, val2) |
| 157 | 157 | $context->appendSql("VALUES($row)"); |
| 158 | - }else{ |
|
| 158 | + } else{ |
|
| 159 | 159 | //(col0, col1, col2) VALUES(val0, val1, val2) |
| 160 | 160 | $columns = implode(',', array_map(function($k){return DB::wrap($k);}, $keys)); |
| 161 | 161 | $context->appendSql("($columns) VALUES($row)",false); |
@@ -181,9 +181,9 @@ discard block |
||
| 181 | 181 | foreach ($values as &$v){ |
| 182 | 182 | if($v instanceof Raw){ |
| 183 | 183 | $v = $v->get(); |
| 184 | - }elseif(is_bool($v)){ |
|
| 184 | + } elseif(is_bool($v)){ |
|
| 185 | 185 | $v = $v?'true':'false'; |
| 186 | - }elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){ |
|
| 186 | + } elseif(!in_array(gettype($v), ['integer', 'boolean', 'double', 'float'])){ |
|
| 187 | 187 | $v = (string)$v; |
| 188 | 188 | $v = str_replace("\\", "\\\\", $v); |
| 189 | 189 | $v = str_replace("'", "\\'", $v); |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | public function set(Context $context, $expr, $args){ |
| 208 | 208 | if(is_string($expr)){ |
| 209 | 209 | return $this->setExpr($context, $expr, $args); |
| 210 | - }else{ |
|
| 210 | + } else{ |
|
| 211 | 211 | return $this->setArgs($context, $expr); |
| 212 | 212 | } |
| 213 | 213 | } |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | if($this->first){ |
| 217 | 217 | $this->first = false; |
| 218 | 218 | $prefix = 'SET '; |
| 219 | - }else{ |
|
| 219 | + } else{ |
|
| 220 | 220 | $prefix = ','; |
| 221 | 221 | } |
| 222 | 222 | |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | $k = DB::wrap($k); |
| 232 | 232 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
| 233 | 233 | $set[]= "$k=".$v->get(); |
| 234 | - }else{ |
|
| 234 | + } else{ |
|
| 235 | 235 | $set[]= "$k=?"; |
| 236 | 236 | $params[]=$v; |
| 237 | 237 | } |
@@ -240,7 +240,7 @@ discard block |
||
| 240 | 240 | $this->first = false; |
| 241 | 241 | $context->appendSql('SET '.implode(',', $set)); |
| 242 | 242 | $context->appendParams($params); |
| 243 | - }else{ |
|
| 243 | + } else{ |
|
| 244 | 244 | $context->appendSql(','.implode(',', $set),false); |
| 245 | 245 | $context->appendParams($params); |
| 246 | 246 | } |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | foreach ($orders as $k=>$v){ |
| 258 | 258 | if(is_integer($k)){ |
| 259 | 259 | $params[] = DB::wrap($v); |
| 260 | - }else{ |
|
| 260 | + } else{ |
|
| 261 | 261 | $k = DB::wrap($k); |
| 262 | 262 | |
| 263 | 263 | $v = strtoupper($v); |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | if($this->first){ |
| 270 | 270 | $this->first = false; |
| 271 | 271 | $context->appendSql('ORDER BY '.implode(',', $params)); |
| 272 | - }else{ |
|
| 272 | + } else{ |
|
| 273 | 273 | $context->appendSql(','.implode(',', $params),false); |
| 274 | 274 | } |
| 275 | 275 | return $this; |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | if(is_string($column)){ |
| 279 | 279 | if($order === null){ |
| 280 | 280 | $column = [$column]; |
| 281 | - }else{ |
|
| 281 | + } else{ |
|
| 282 | 282 | $column = [$column=>$order]; |
| 283 | 283 | } |
| 284 | 284 | } |
@@ -322,9 +322,9 @@ discard block |
||
| 322 | 322 | } |
| 323 | 323 | if(is_callable($expr)){ |
| 324 | 324 | self::conditionClosure($context,$prefix, $expr); |
| 325 | - }elseif (is_string($expr)){ |
|
| 325 | + } elseif (is_string($expr)){ |
|
| 326 | 326 | self::condition($context, $prefix, $expr, $args); |
| 327 | - }else{ |
|
| 327 | + } else{ |
|
| 328 | 328 | self::conditionArgs($context, $prefix, $expr); |
| 329 | 329 | } |
| 330 | 330 | |
@@ -383,14 +383,14 @@ discard block |
||
| 383 | 383 | $stubs = "({$var->context->sql})"; |
| 384 | 384 | $params = array_merge($params, $var->context->params); |
| 385 | 385 | $exprs[] = "$k $op $stubs"; |
| 386 | - }else{ |
|
| 386 | + } else{ |
|
| 387 | 387 | foreach ($var as $i){ |
| 388 | 388 | if(is_a($i, Raw::class)){ |
| 389 | 389 | $stubs[]=strval($i); |
| 390 | - }elseif($i instanceof BasicRule){ |
|
| 390 | + } elseif($i instanceof BasicRule){ |
|
| 391 | 391 | $stubs = "({$i->context->sql})"; |
| 392 | 392 | $params = array_merge($params, $i->context->params); |
| 393 | - }else{ |
|
| 393 | + } else{ |
|
| 394 | 394 | $stubs[]='?'; |
| 395 | 395 | $params[] = $i; |
| 396 | 396 | } |
@@ -398,34 +398,34 @@ discard block |
||
| 398 | 398 | $stubs = implode(',', $stubs); |
| 399 | 399 | $exprs[] = "$k $op ($stubs)"; |
| 400 | 400 | } |
| 401 | - }else if($op == 'BETWEEN'){ |
|
| 401 | + } else if($op == 'BETWEEN'){ |
|
| 402 | 402 | $cond = "$k BETWEEN"; |
| 403 | 403 | if(is_a($var[0], Raw::class)){ |
| 404 | 404 | $cond = "$cond ".strval($var[0]); |
| 405 | - }elseif($var[0] instanceof BasicRule){ |
|
| 405 | + } elseif($var[0] instanceof BasicRule){ |
|
| 406 | 406 | $cond = "$cond ({$var[0]->context->sql})"; |
| 407 | 407 | $params = array_merge($params, $var[0]->context->params); |
| 408 | - }else{ |
|
| 408 | + } else{ |
|
| 409 | 409 | $cond = "$cond ?"; |
| 410 | 410 | $params[] = $var[0]; |
| 411 | 411 | } |
| 412 | 412 | if(is_a($var[1], Raw::class)){ |
| 413 | 413 | $cond = "$cond AND ".strval($var[1]); |
| 414 | - }elseif($var[1] instanceof BasicRule){ |
|
| 414 | + } elseif($var[1] instanceof BasicRule){ |
|
| 415 | 415 | $cond = "$cond AND ({$var[1]->context->sql})"; |
| 416 | 416 | $params = array_merge($params, $var[1]->context->params); |
| 417 | - }else{ |
|
| 417 | + } else{ |
|
| 418 | 418 | $cond = "$cond AND ?"; |
| 419 | 419 | $params[] = $var[1]; |
| 420 | 420 | } |
| 421 | 421 | $exprs[] = $cond; |
| 422 | - }else{ |
|
| 422 | + } else{ |
|
| 423 | 423 | if(is_a($var, Raw::class)){ |
| 424 | 424 | $exprs[] = "$k $op ".strval($var); |
| 425 | - }elseif($var instanceof BasicRule){ |
|
| 425 | + } elseif($var instanceof BasicRule){ |
|
| 426 | 426 | $exprs[] = "$k $op {$var->context->sql}"; |
| 427 | 427 | $params = array_merge($params, $var->context->params); |
| 428 | - }else{ |
|
| 428 | + } else{ |
|
| 429 | 429 | $exprs[] = "$k $op ?"; |
| 430 | 430 | $params[] = $var; |
| 431 | 431 | } |
@@ -464,21 +464,21 @@ discard block |
||
| 464 | 464 | foreach ($arg as $i){ |
| 465 | 465 | if(is_a($i, Raw::class)){ |
| 466 | 466 | $stubs[] = strval($i); |
| 467 | - }else{ |
|
| 467 | + } else{ |
|
| 468 | 468 | $stubs[] = '?'; |
| 469 | 469 | $newArgs[] = $i; |
| 470 | 470 | } |
| 471 | 471 | } |
| 472 | 472 | $stubs = implode(',', $stubs); |
| 473 | - }elseif($arg instanceof BasicRule){ |
|
| 473 | + } elseif($arg instanceof BasicRule){ |
|
| 474 | 474 | $stubs = "({$arg->context->sql})"; |
| 475 | 475 | $newArgs = array_merge($newArgs, $arg->context->params); |
| 476 | - }else{ |
|
| 476 | + } else{ |
|
| 477 | 477 | $stubs = strval($arg); |
| 478 | 478 | } |
| 479 | 479 | $toReplace[] = [$pos, $stubs]; |
| 480 | 480 | |
| 481 | - }else{ |
|
| 481 | + } else{ |
|
| 482 | 482 | $newArgs[]=$arg; |
| 483 | 483 | } |
| 484 | 484 | } |
@@ -494,7 +494,7 @@ discard block |
||
| 494 | 494 | } |
| 495 | 495 | if($prefix){ |
| 496 | 496 | $context->appendSql($prefix.' '.$expr); |
| 497 | - }else{ |
|
| 497 | + } else{ |
|
| 498 | 498 | $context->appendSql($expr); |
| 499 | 499 | } |
| 500 | 500 | |
@@ -526,7 +526,7 @@ discard block |
||
| 526 | 526 | $st = $context->connection->prepare($context->sql); |
| 527 | 527 | $success = $st->execute($context->params); |
| 528 | 528 | return new ExecResult($success, $context->connection, $st); |
| 529 | - }catch (\Exception $e){ |
|
| 529 | + } catch (\Exception $e){ |
|
| 530 | 530 | \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] ); |
| 531 | 531 | return null; |
| 532 | 532 | } |
@@ -552,10 +552,10 @@ discard block |
||
| 552 | 552 | return $context->handleResult($dict); |
| 553 | 553 | } |
| 554 | 554 | return $context->handleResult($res); |
| 555 | - }else{ |
|
| 555 | + } else{ |
|
| 556 | 556 | return false; |
| 557 | 557 | } |
| 558 | - }catch (\Exception $e){ |
|
| 558 | + } catch (\Exception $e){ |
|
| 559 | 559 | \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] ); |
| 560 | 560 | return false; |
| 561 | 561 | } |
@@ -583,7 +583,7 @@ discard block |
||
| 583 | 583 | if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) || |
| 584 | 584 | count($found)==0){ |
| 585 | 585 | $columnEnd = strlen($context->sql); |
| 586 | - }else{ |
|
| 586 | + } else{ |
|
| 587 | 587 | list($chars, $columnEnd) = $found[0]; |
| 588 | 588 | } |
| 589 | 589 | $sql = substr($context->sql, 0, $columnBegin); |
@@ -594,10 +594,10 @@ discard block |
||
| 594 | 594 | if($st->execute($context->params)){ |
| 595 | 595 | $res = $st->fetchAll(\PDO::FETCH_ASSOC); |
| 596 | 596 | return intval($res[0]['count']); |
| 597 | - }else{ |
|
| 597 | + } else{ |
|
| 598 | 598 | return false; |
| 599 | 599 | } |
| 600 | - }catch (\Exception $e){ |
|
| 600 | + } catch (\Exception $e){ |
|
| 601 | 601 | \PhpBoot\abort(new DBException($context, $e->getMessage(),$e->getCode(), $e), ['sql'=>$context->sql, 'params'=>$context->params] ); |
| 602 | 602 | return false; |
| 603 | 603 | } |
@@ -608,7 +608,7 @@ discard block |
||
| 608 | 608 | public function set($context, $column, $value){ |
| 609 | 609 | if(is_string($column)){ |
| 610 | 610 | $this->setExpr($context, $column, $value); |
| 611 | - }else{ |
|
| 611 | + } else{ |
|
| 612 | 612 | $this->setArgs($context, $column); |
| 613 | 613 | } |
| 614 | 614 | } |
@@ -618,7 +618,7 @@ discard block |
||
| 618 | 618 | if($this->first){ |
| 619 | 619 | $this->first = false; |
| 620 | 620 | $prefix = 'ON DUPLICATE KEY UPDATE '; |
| 621 | - }else{ |
|
| 621 | + } else{ |
|
| 622 | 622 | $prefix = ','; |
| 623 | 623 | } |
| 624 | 624 | |
@@ -633,7 +633,7 @@ discard block |
||
| 633 | 633 | $k = DB::wrap($k); |
| 634 | 634 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
| 635 | 635 | $set[]= "$k=".$v->get(); |
| 636 | - }else{ |
|
| 636 | + } else{ |
|
| 637 | 637 | $set[]= "$k=?"; |
| 638 | 638 | $params[]=$v; |
| 639 | 639 | } |
@@ -642,7 +642,7 @@ discard block |
||
| 642 | 642 | $this->first = false; |
| 643 | 643 | $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set)); |
| 644 | 644 | $context->appendParams($params); |
| 645 | - }else{ |
|
| 645 | + } else{ |
|
| 646 | 646 | $context->appendSql(','.implode(',', $set),false); |
| 647 | 647 | $context->appendParams($params); |
| 648 | 648 | } |