Изменена логика обработки и вывода ошибок

Author: mepihindeveloper

src/ConsoleSqlMigration.php

@@ -64,18 +64,21 @@ public function down(int $count = 0): array {
 			exit;
 		}
 
-		foreach ($migrations['success'] as $successMigration) {
-			Console::writeLine("Миграция {$successMigration['name']} успешно отменена", Console::FG_GREEN);
-		}
-		
 		if (array_key_exists('error', $migrations)) {
 			foreach ($migrations['error'] as $errorMigration) {
-				Console::writeLine("Ошибка отмены миграции {$errorMigration['name']}", Console::FG_RED);
+				Console::writeLine("Ошибка отмены миграции {$errorMigration['name']} : " .
+					PHP_EOL .
+					$errorMigration['errorMessage'],
+					Console::FG_RED);
 			}
 
 			exit;
 		}
 
+		foreach ($migrations['success'] as $successMigration) {
+			Console::writeLine("Миграция {$successMigration['name']} успешно отменена", Console::FG_GREEN);
+		}
+		
 		return $migrations;
 	}
 

src/SqlMigration.php

@@ -7,6 +7,7 @@
 use DateTime;
 use mepihindeveloper\components\exceptions\SqlMigrationException;
 use mepihindeveloper\components\interfaces\{DatabaseInterface, SqlMigrationInterface};
+use PDOException;
 use RuntimeException;
 
 /**
@@ -186,22 +187,22 @@ protected function execute(array $list, int $count, string $type): array {
 				throw new RuntimeException('Ошибка поиска/чтения миграции');
 			}
 
-			if (!empty($migrationContent)) {
-				$this->database->beginTransaction();
-				$this->database->execute($migrationContent);
-				$this->database->commit();
-			}
-			
 			try {
+				if (!empty($migrationContent)) {
+					$this->database->beginTransaction();
+					$this->database->execute($migrationContent);
+					$this->database->commit();
+				}
+				
 				if ($type === self::UP) {
 					$this->addHistory($migration['name']);
 				} else {
 					$this->removeHistory($migration['name']);
 				}
 
 				$migrationInfo['success'][] = $migration;
-			} catch (SqlMigrationException $exception) {
-				$migrationInfo['error'][] = $migration;
+			} catch (SqlMigrationException | PDOException $exception) {
+				$migrationInfo['error'][] = array_merge($migration, ['errorMessage' => $exception->getMessage()]);
 
 				break;
 			}