@@ -165,8 +165,7 @@ discard block |
||
| 165 | 165 | ]; |
| 166 | 166 | |
| 167 | 167 | $type = ConstFieldType::IGNORE; |
| 168 | - } |
|
| 169 | - else |
|
| 168 | + } else |
|
| 170 | 169 | { |
| 171 | 170 | $type = ord($data['column_types'][$i]); |
| 172 | 171 | } |
@@ -305,123 +304,98 @@ discard block |
||
| 305 | 304 | if ($this->checkNull($null_bitmap, $nullBitmapIndex)) |
| 306 | 305 | { |
| 307 | 306 | $values[$name] = null; |
| 308 | - } |
|
| 309 | - elseif ($column['type'] === ConstFieldType::IGNORE) |
|
| 307 | + } elseif ($column['type'] === ConstFieldType::IGNORE) |
|
| 310 | 308 | { |
| 311 | 309 | $values[$name] = null; |
| 312 | - } |
|
| 313 | - elseif ($column['type'] === ConstFieldType::TINY) |
|
| 310 | + } elseif ($column['type'] === ConstFieldType::TINY) |
|
| 314 | 311 | { |
| 315 | 312 | if (true === $column['unsigned']) |
| 316 | 313 | { |
| 317 | 314 | $values[$name] = $this->binaryDataReader->readUInt8(); |
| 318 | - } |
|
| 319 | - else |
|
| 315 | + } else |
|
| 320 | 316 | { |
| 321 | 317 | $values[$name] = $this->binaryDataReader->readInt8(); |
| 322 | 318 | } |
| 323 | - } |
|
| 324 | - elseif ($column['type'] === ConstFieldType::SHORT) |
|
| 319 | + } elseif ($column['type'] === ConstFieldType::SHORT) |
|
| 325 | 320 | { |
| 326 | 321 | if (true === $column['unsigned']) |
| 327 | 322 | { |
| 328 | 323 | $values[$name] = $this->binaryDataReader->readUInt16(); |
| 329 | - } |
|
| 330 | - else |
|
| 324 | + } else |
|
| 331 | 325 | { |
| 332 | 326 | $values[$name] = $this->binaryDataReader->readInt16(); |
| 333 | 327 | } |
| 334 | - } |
|
| 335 | - elseif ($column['type'] === ConstFieldType::LONG) |
|
| 328 | + } elseif ($column['type'] === ConstFieldType::LONG) |
|
| 336 | 329 | { |
| 337 | 330 | if (true === $column['unsigned']) |
| 338 | 331 | { |
| 339 | 332 | $values[$name] = $this->binaryDataReader->readUInt32(); |
| 340 | - } |
|
| 341 | - else |
|
| 333 | + } else |
|
| 342 | 334 | { |
| 343 | 335 | $values[$name] = $this->binaryDataReader->readInt32(); |
| 344 | 336 | } |
| 345 | - } |
|
| 346 | - elseif ($column['type'] === ConstFieldType::LONGLONG) |
|
| 337 | + } elseif ($column['type'] === ConstFieldType::LONGLONG) |
|
| 347 | 338 | { |
| 348 | 339 | if (true === $column['unsigned']) |
| 349 | 340 | { |
| 350 | 341 | $values[$name] = $this->binaryDataReader->readUInt64(); |
| 351 | - } |
|
| 352 | - else |
|
| 342 | + } else |
|
| 353 | 343 | { |
| 354 | 344 | $values[$name] = $this->binaryDataReader->readInt64(); |
| 355 | 345 | } |
| 356 | - } |
|
| 357 | - elseif ($column['type'] === ConstFieldType::INT24) |
|
| 346 | + } elseif ($column['type'] === ConstFieldType::INT24) |
|
| 358 | 347 | { |
| 359 | 348 | if (true === $column['unsigned']) |
| 360 | 349 | { |
| 361 | 350 | $values[$name] = $this->binaryDataReader->readUInt24(); |
| 362 | - } |
|
| 363 | - else |
|
| 351 | + } else |
|
| 364 | 352 | { |
| 365 | 353 | $values[$name] = $this->binaryDataReader->readInt24(); |
| 366 | 354 | } |
| 367 | - } |
|
| 368 | - elseif ($column['type'] === ConstFieldType::FLOAT) |
|
| 355 | + } elseif ($column['type'] === ConstFieldType::FLOAT) |
|
| 369 | 356 | { |
| 370 | 357 | // http://dev.mysql.com/doc/refman/5.7/en/floating-point-types.html FLOAT(7,4) |
| 371 | 358 | $values[$name] = round($this->binaryDataReader->readFloat(), 4); |
| 372 | - } |
|
| 373 | - elseif ($column['type'] === ConstFieldType::DOUBLE) |
|
| 359 | + } elseif ($column['type'] === ConstFieldType::DOUBLE) |
|
| 374 | 360 | { |
| 375 | 361 | $values[$name] = $this->binaryDataReader->readDouble(); |
| 376 | - } |
|
| 377 | - elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING) |
|
| 362 | + } elseif ($column['type'] === ConstFieldType::VARCHAR || $column['type'] === ConstFieldType::STRING) |
|
| 378 | 363 | { |
| 379 | 364 | if ($column['max_length'] > 255) |
| 380 | 365 | { |
| 381 | 366 | $values[$name] = $this->getString(2, $column); |
| 382 | - } |
|
| 383 | - else |
|
| 367 | + } else |
|
| 384 | 368 | { |
| 385 | 369 | $values[$name] = $this->getString(1, $column); |
| 386 | 370 | } |
| 387 | - } |
|
| 388 | - elseif ($column['type'] === ConstFieldType::NEWDECIMAL) |
|
| 371 | + } elseif ($column['type'] === ConstFieldType::NEWDECIMAL) |
|
| 389 | 372 | { |
| 390 | 373 | $values[$name] = $this->getDecimal($column); |
| 391 | - } |
|
| 392 | - elseif ($column['type'] === ConstFieldType::BLOB) |
|
| 374 | + } elseif ($column['type'] === ConstFieldType::BLOB) |
|
| 393 | 375 | { |
| 394 | 376 | $values[$name] = $this->getString($column['length_size'], $column); |
| 395 | - } |
|
| 396 | - elseif ($column['type'] === ConstFieldType::DATETIME) |
|
| 377 | + } elseif ($column['type'] === ConstFieldType::DATETIME) |
|
| 397 | 378 | { |
| 398 | 379 | $values[$name] = $this->getDatetime(); |
| 399 | - } |
|
| 400 | - elseif ($column['type'] === ConstFieldType::DATETIME2) |
|
| 380 | + } elseif ($column['type'] === ConstFieldType::DATETIME2) |
|
| 401 | 381 | { |
| 402 | 382 | $values[$name] = $this->getDatetime2($column); |
| 403 | - } |
|
| 404 | - elseif ($column['type'] === ConstFieldType::TIMESTAMP) |
|
| 383 | + } elseif ($column['type'] === ConstFieldType::TIMESTAMP) |
|
| 405 | 384 | { |
| 406 | 385 | $values[$name] = date('c', $this->binaryDataReader->readUInt32()); |
| 407 | - } |
|
| 408 | - elseif ($column['type'] === ConstFieldType::TIME2) |
|
| 386 | + } elseif ($column['type'] === ConstFieldType::TIME2) |
|
| 409 | 387 | { |
| 410 | 388 | $values[$name] = $this->getTime2($column); |
| 411 | - } |
|
| 412 | - elseif ($column['type'] === ConstFieldType::TIMESTAMP2) |
|
| 389 | + } elseif ($column['type'] === ConstFieldType::TIMESTAMP2) |
|
| 413 | 390 | { |
| 414 | 391 | $values[$name] = $this->getTimestamp2($column); |
| 415 | - } |
|
| 416 | - elseif ($column['type'] === ConstFieldType::DATE) |
|
| 392 | + } elseif ($column['type'] === ConstFieldType::DATE) |
|
| 417 | 393 | { |
| 418 | 394 | $values[$name] = $this->getDate(); |
| 419 | - } |
|
| 420 | - elseif ($column['type'] === ConstFieldType::YEAR) |
|
| 395 | + } elseif ($column['type'] === ConstFieldType::YEAR) |
|
| 421 | 396 | { |
| 422 | 397 | $values[$name] = $this->binaryDataReader->readUInt8() + 1900; |
| 423 | - } |
|
| 424 | - elseif ($column['type'] === ConstFieldType::ENUM) |
|
| 398 | + } elseif ($column['type'] === ConstFieldType::ENUM) |
|
| 425 | 399 | { |
| 426 | 400 | $value = $this->binaryDataReader->readUIntBySize($column['size']) - 1; |
| 427 | 401 | |
@@ -431,26 +405,21 @@ discard block |
||
| 431 | 405 | { |
| 432 | 406 | $values[$name] = $column['enum_values'][$value]; |
| 433 | 407 | } |
| 434 | - } |
|
| 435 | - elseif ($column['type'] === ConstFieldType::SET) |
|
| 408 | + } elseif ($column['type'] === ConstFieldType::SET) |
|
| 436 | 409 | { |
| 437 | 410 | $values[$name] = $this->getSet($column); |
| 438 | - } |
|
| 439 | - elseif ($column['type'] === ConstFieldType::BIT) |
|
| 411 | + } elseif ($column['type'] === ConstFieldType::BIT) |
|
| 440 | 412 | { |
| 441 | 413 | $values[$name] = $this->getBit($column); |
| 442 | - } |
|
| 443 | - elseif ($column['type'] === ConstFieldType::GEOMETRY) |
|
| 414 | + } elseif ($column['type'] === ConstFieldType::GEOMETRY) |
|
| 444 | 415 | { |
| 445 | 416 | $values[$name] = $this->binaryDataReader->readLengthCodedPascalString($column['length_size']); |
| 446 | - } |
|
| 447 | - elseif ($column['type'] === ConstFieldType::JSON) |
|
| 417 | + } elseif ($column['type'] === ConstFieldType::JSON) |
|
| 448 | 418 | { |
| 449 | 419 | $values[$name] = $this->jsonBinaryDecoderFactory->makeJsonBinaryDecoder( |
| 450 | 420 | $this->binaryDataReader->readLengthCodedPascalString($column['length_size']) |
| 451 | 421 | )->parseToString(); |
| 452 | - } |
|
| 453 | - else |
|
| 422 | + } else |
|
| 454 | 423 | { |
| 455 | 424 | throw new MySQLReplicationException('Unknown row type: ' . $column['type']); |
| 456 | 425 | } |
@@ -552,8 +521,7 @@ discard block |
||
| 552 | 521 | { |
| 553 | 522 | $mask = 0; |
| 554 | 523 | $res = ''; |
| 555 | - } |
|
| 556 | - else |
|
| 524 | + } else |
|
| 557 | 525 | { |
| 558 | 526 | $mask = -1; |
| 559 | 527 | $res = '-'; |
@@ -688,12 +656,10 @@ discard block |
||
| 688 | 656 | if ($column['fsp'] === 1 || $column['fsp'] === 2) |
| 689 | 657 | { |
| 690 | 658 | $read = 1; |
| 691 | - } |
|
| 692 | - elseif ($column['fsp'] === 3 || $column['fsp'] === 4) |
|
| 659 | + } elseif ($column['fsp'] === 3 || $column['fsp'] === 4) |
|
| 693 | 660 | { |
| 694 | 661 | $read = 2; |
| 695 | - } |
|
| 696 | - elseif ($column ['fsp'] === 5 || $column['fsp'] === 6) |
|
| 662 | + } elseif ($column ['fsp'] === 5 || $column['fsp'] === 6) |
|
| 697 | 663 | { |
| 698 | 664 | $read = 3; |
| 699 | 665 | } |
@@ -814,8 +780,7 @@ discard block |
||
| 814 | 780 | if (1 === $column['bytes']) |
| 815 | 781 | { |
| 816 | 782 | $end = $column['bits']; |
| 817 | - } |
|
| 818 | - else |
|
| 783 | + } else |
|
| 819 | 784 | { |
| 820 | 785 | $end = $column['bits'] % 8; |
| 821 | 786 | if (0 === $end) |
@@ -823,8 +788,7 @@ discard block |
||
| 823 | 788 | $end = 8; |
| 824 | 789 | } |
| 825 | 790 | } |
| 826 | - } |
|
| 827 | - else |
|
| 791 | + } else |
|
| 828 | 792 | { |
| 829 | 793 | $end = 8; |
| 830 | 794 | } |
@@ -834,8 +798,7 @@ discard block |
||
| 834 | 798 | if ($data & (1 << $bit)) |
| 835 | 799 | { |
| 836 | 800 | $current_byte .= '1'; |
| 837 | - } |
|
| 838 | - else |
|
| 801 | + } else |
|
| 839 | 802 | { |
| 840 | 803 | $current_byte .= '0'; |
| 841 | 804 | } |