@@ -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 | } |
@@ -270,7 +270,7 @@ discard block |
||
| 270 | 270 | static public function having(Context $context, $expr, $args){ |
| 271 | 271 | if(is_string($expr)){ |
| 272 | 272 | self::condition($context, 'HAVING', $expr, $args); |
| 273 | - }else{ |
|
| 273 | + } else{ |
|
| 274 | 274 | self::conditionArgs($context, 'HAVING', $expr); |
| 275 | 275 | } |
| 276 | 276 | //TODO 支持 OR 、 闭包 |
@@ -282,7 +282,7 @@ discard block |
||
| 282 | 282 | } |
| 283 | 283 | if (is_string($expr)){ |
| 284 | 284 | self::condition($context, 'WHERE', $expr, $args); |
| 285 | - }else{ |
|
| 285 | + } else{ |
|
| 286 | 286 | self::conditionArgs($context, 'WHERE', $expr); |
| 287 | 287 | } |
| 288 | 288 | //TODO 支持 OR 、 闭包 |
@@ -331,41 +331,41 @@ discard block |
||
| 331 | 331 | foreach ($var as $i){ |
| 332 | 332 | if(is_a($i, Raw::class)){ |
| 333 | 333 | $stubs[]=strval($i); |
| 334 | - }else{ |
|
| 334 | + } else{ |
|
| 335 | 335 | $stubs[]='?'; |
| 336 | 336 | $params[] = $i; |
| 337 | 337 | } |
| 338 | 338 | } |
| 339 | 339 | $stubs = implode(',', $stubs); |
| 340 | 340 | $exprs[] = "$k $op ($stubs)"; |
| 341 | - }else if($op == 'BETWEEN'){ |
|
| 341 | + } else if($op == 'BETWEEN'){ |
|
| 342 | 342 | $cond = "$k BETWEEN"; |
| 343 | 343 | if(is_a($var[0], Raw::class)){ |
| 344 | 344 | $cond = "$cond ".strval($var[0]); |
| 345 | - }else{ |
|
| 345 | + } else{ |
|
| 346 | 346 | $cond = "$cond ?"; |
| 347 | 347 | $params[] = $var[0]; |
| 348 | 348 | } |
| 349 | 349 | if(is_a($var[1], Raw::class)){ |
| 350 | 350 | $cond = "$cond AND ".strval($var[1]); |
| 351 | - }else{ |
|
| 351 | + } else{ |
|
| 352 | 352 | $cond = "$cond AND ?"; |
| 353 | 353 | $params[] = $var[1]; |
| 354 | 354 | } |
| 355 | 355 | $exprs[] = $cond; |
| 356 | - }else{ |
|
| 356 | + } else{ |
|
| 357 | 357 | if(is_a($var, Raw::class)){ |
| 358 | 358 | $exprs[] = "$k $op ".strval($var); |
| 359 | - }else{ |
|
| 359 | + } else{ |
|
| 360 | 360 | $exprs[] = "$k $op ?"; |
| 361 | 361 | $params[] = $var; |
| 362 | 362 | } |
| 363 | 363 | } |
| 364 | - }else{ |
|
| 364 | + } else{ |
|
| 365 | 365 | if(is_a($v, Raw::class)){ |
| 366 | 366 | $exprs[] = "$k = ".strval($v); |
| 367 | 367 | |
| 368 | - }else{ |
|
| 368 | + } else{ |
|
| 369 | 369 | $exprs[] = "$k = ?"; |
| 370 | 370 | $params[] = $v; |
| 371 | 371 | } |
@@ -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 | } |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | return $context->handleResult($dict); |
| 475 | 475 | } |
| 476 | 476 | return $context->handleResult($res); |
| 477 | - }else{ |
|
| 477 | + } else{ |
|
| 478 | 478 | return false; |
| 479 | 479 | } |
| 480 | 480 | } |
@@ -498,7 +498,7 @@ discard block |
||
| 498 | 498 | if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) || |
| 499 | 499 | count($found)==0){ |
| 500 | 500 | $columnEnd = strlen($context->sql); |
| 501 | - }else{ |
|
| 501 | + } else{ |
|
| 502 | 502 | list($chars, $columnEnd) = $found[0]; |
| 503 | 503 | } |
| 504 | 504 | $sql = substr($context->sql, 0, $columnBegin); |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | if($st->execute($context->params)){ |
| 510 | 510 | $res = $st->fetchAll(\PDO::FETCH_ASSOC); |
| 511 | 511 | return $res[0]['count']; |
| 512 | - }else{ |
|
| 512 | + } else{ |
|
| 513 | 513 | return false; |
| 514 | 514 | } |
| 515 | 515 | |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | public function set($context, $column, $value){ |
| 521 | 521 | if(is_string($column)){ |
| 522 | 522 | $this->setExpr($context, $column, $value); |
| 523 | - }else{ |
|
| 523 | + } else{ |
|
| 524 | 524 | $this->setArgs($context, $column); |
| 525 | 525 | } |
| 526 | 526 | } |
@@ -530,7 +530,7 @@ discard block |
||
| 530 | 530 | if($this->first){ |
| 531 | 531 | $this->first = false; |
| 532 | 532 | $prefix = 'ON DUPLICATE KEY UPDATE '; |
| 533 | - }else{ |
|
| 533 | + } else{ |
|
| 534 | 534 | $prefix = ','; |
| 535 | 535 | } |
| 536 | 536 | |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $k = DB::wrap($k); |
| 546 | 546 | if(is_a($v, Raw::class)){//直接拼接sql,不需要转义 |
| 547 | 547 | $set[]= "$k=".$v->get(); |
| 548 | - }else{ |
|
| 548 | + } else{ |
|
| 549 | 549 | $set[]= "$k=?"; |
| 550 | 550 | $params[]=$v; |
| 551 | 551 | } |
@@ -554,7 +554,7 @@ discard block |
||
| 554 | 554 | $this->first = false; |
| 555 | 555 | $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set)); |
| 556 | 556 | $context->appendParams($params); |
| 557 | - }else{ |
|
| 557 | + } else{ |
|
| 558 | 558 | $context->appendSql(','.implode(',', $set),false); |
| 559 | 559 | $context->appendParams($params); |
| 560 | 560 | } |