Merge pull request #13 from sakuraovq/master

add error handler

Author: stelin

src/Command/EntityCommand.php

@@ -3,17 +3,14 @@
 
 namespace Swoft\Devtool\Command;
 
-use Leuffen\TextTemplate\TemplateParsingException;
-use ReflectionException;
 use Swoft\Bean\Annotation\Mapping\Inject;
-use Swoft\Bean\Exception\ContainerException;
 use Swoft\Console\Annotation\Mapping\Command;
 use Swoft\Console\Annotation\Mapping\CommandArgument;
 use Swoft\Console\Annotation\Mapping\CommandMapping;
 use Swoft\Console\Annotation\Mapping\CommandOption;
-use Swoft\Db\Exception\DbException;
 use Swoft\Db\Pool;
 use Swoft\Devtool\Model\Logic\EntityLogic;
+use Throwable;
 use function input;
 
 /**
@@ -41,16 +38,12 @@ class EntityCommand
      * @CommandOption(name="table", desc="database table names", type="string")
      * @CommandOption(name="pool", desc="database db pool default is 'db.pool'", type="string")
      * @CommandOption(name="path", desc="generate entity file path", type="string", default="@app/Model/Entity")
-     * @CommandOption(name="y", desc="generating entity file is confirm ", type="string")
+     * @CommandOption(name="y", desc="do you need confirmation?", type="string")
      * @CommandOption(name="field_prefix", desc="database field prefix ,alias is 'fp'", type="string")
-     * @CommandOption(name="table_prefix", desc="like match database table prefix ,alias is 'tp'", type="string")
-     * @CommandOption(name="exclude", desc="expect generate database table entity ,alias is 'exc'", type="string")
+     * @CommandOption(name="table_prefix", desc="like match database table prefix, alias is 'tp'", type="string")
+     * @CommandOption(name="exclude", desc="expect generate database table entity, alias is 'exc'", type="string")
      * @CommandOption(name="td", desc="generate entity template path",type="string", default="@devtool/devtool/resource/template")
      *
-     * @throws TemplateParsingException
-     * @throws ReflectionException
-     * @throws ContainerException
-     * @throws DbException
      */
     public function create(): void
     {
@@ -63,15 +56,19 @@ public function create(): void
         $exclude     = input()->getOpt('exc', input()->getOpt('exclude'));
         $tplDir      = input()->getOpt('td', '@devtool/devtool/resource/template');
 
-        $this->logic->create([
-            (string)$table,
-            (string)$tablePrefix,
-            (string)$fieldPrefix,
-            (string)$exclude,
-            (string)$pool,
-            (string)$path,
-            (bool)$isConfirm,
-            (string)$tplDir
-        ]);
+        try{
+            $this->logic->create([
+                (string)$table,
+                (string)$tablePrefix,
+                (string)$fieldPrefix,
+                (string)$exclude,
+                (string)$pool,
+                (string)$path,
+                (bool)$isConfirm,
+                (string)$tplDir
+            ]);
+        } catch (Throwable $exception) {
+            output()->colored($exception->getMessage(), 'error');
+        }
     }
 }

src/Model/Logic/EntityLogic.php

@@ -55,7 +55,13 @@ class EntityLogic
     public function create(array $params): void
     {
         list($table, $tablePrefix, $fieldPrefix, $exclude, $pool, $path, $isConfirm, $tplDir) = $params;
+
         $tableSchemas = $this->schemaData->getSchemaTableData($pool, $table, $exclude, $tablePrefix);
+        if (empty($tableSchemas)) {
+            output()->colored("Generate entity match table is empty!", 'error');
+            return;
+        }
+
         foreach ($tableSchemas as $tableSchema) {
             $this->readyGenerateId = false;
             $this->generateEntity($tableSchema, $pool, $path, $isConfirm, $fieldPrefix, $tplDir);