Merge pull request #333 from bowphp/refactor/code-base

fix: add protected command and catch console error

Author: papac

src/Console/Command/MigrationCommand.php

@@ -4,16 +4,17 @@
 
 namespace Bow\Console\Command;
 
-use Bow\Console\AbstractCommand;
+use Exception;
+use ErrorException;
+use Bow\Support\Str;
 use Bow\Console\Color;
 use Bow\Database\Database;
+use Bow\Database\QueryBuilder;
+use Bow\Console\AbstractCommand;
+use Bow\Database\Migration\Table;
+use Bow\Database\Exception\MigrationException;
 use Bow\Database\Exception\ConnectionException;
 use Bow\Database\Exception\QueryBuilderException;
-use Bow\Database\Migration\Table;
-use Bow\Database\QueryBuilder;
-use Bow\Support\Str;
-use ErrorException;
-use Exception;
 
 class MigrationCommand extends AbstractCommand
 {
@@ -84,7 +85,13 @@ private function createMigrationTable(): void
     {
         $connection = $this->arg->getParameter("--connection", config("database.default"));
 
-        Database::connection($connection);
+        try {
+            Database::connection($connection);
+        } catch (Exception $exception) {
+            echo Color::red("▶ Please check your database configuration on .env.json file\n");
+            throw new MigrationException($exception->getMessage(), (int)$exception->getCode());
+        }
+
         $adapter = Database::getConnectionAdapter();
 
         $table = $adapter->getTablePrefix() . config('database.migration', 'migrations');
@@ -107,7 +114,12 @@ private function createMigrationTable(): void
             $generator->make()
         );
 
-        Database::statement($sql);
+        try {
+            Database::statement($sql);
+        } catch (Exception $exception) {
+            echo sprintf("%s %s\n", Color::red("▶"), $sql);
+            throw new MigrationException($exception->getMessage(), (int)$exception->getCode());
+        }
     }
 
     /**

src/Console/Console.php

@@ -39,7 +39,9 @@ class Console
         'seed',
         'help',
         'clear',
-        'flush'
+        'flush',
+        'launch',
+        'serve',
     ];
 
     /**
@@ -256,7 +258,7 @@ public function call(?string $command): mixed
         try {
             return call_user_func_array([$this, $command], [$this->arg->getRawCommand()]);
         } catch (Exception $e) {
-            echo $e->getMessage();
+            echo Color::red(sprintf("$command command failed with: %s\n", $e->getMessage()));
             exit(1);
         }
     }

src/Database/Connection/Adapters/SqliteAdapter.php

@@ -45,13 +45,11 @@ public function connection(): void
         // Build the PDO connection
         $this->pdo = new PDO('sqlite:' . $this->config['database']);
 
-        // Set the PDO attributes that we want
+        $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $this->pdo->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
         $this->pdo->setAttribute(
             PDO::ATTR_DEFAULT_FETCH_MODE,
             $this->config['fetch'] ?? $this->fetch
         );
-
-        $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        $this->pdo->setAttribute(PDO::ATTR_ORACLE_NULLS, PDO::NULL_EMPTY_STRING);
     }
 }