From ff1d7dfd2e10b72205c656264ce1a0c344b6bceb Mon Sep 17 00:00:00 2001
From: yanwenwu <njphper@gmail.com>
Date: Wed, 20 May 2020 11:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/generate/Generator.php       |  7 ++++++-
 extend/catcher/generate/factory/Factory.php |  2 --
 extend/catcher/generate/factory/SQL.php     | 14 +++++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/extend/catcher/generate/Generator.php b/extend/catcher/generate/Generator.php
index 80464db..eb4f204 100644
--- a/extend/catcher/generate/Generator.php
+++ b/extend/catcher/generate/Generator.php
@@ -100,8 +100,13 @@ class Generator
             'other_function' => $params['controller']['other_function'],
         ];
 
+        $table = $params['controller']['table'] ?? '';
+        if ($table) {
+            $table =  \config('database.connections.mysql.prefix') . $table;
+
+        }
         $model = [
-            'table' => $params['controller']['table'] ?? '',
+            'table' => $table,
             'model' => $params['controller']['model'] ?? '',
             'sql'   => $params['model']['data'],
             'extra' => $params['model']['extra'],
diff --git a/extend/catcher/generate/factory/Factory.php b/extend/catcher/generate/factory/Factory.php
index 1519ed1..c42595b 100644
--- a/extend/catcher/generate/factory/Factory.php
+++ b/extend/catcher/generate/factory/Factory.php
@@ -93,8 +93,6 @@ abstract class Factory
     {
         $tables = Db::getConnection()->getTables();
 
-        $table = \config('database.connections.mysql.prefix') . $table;
-
         return in_array($table, $tables) ? $table : false;
     }
 }
\ No newline at end of file
diff --git a/extend/catcher/generate/factory/SQL.php b/extend/catcher/generate/factory/SQL.php
index 51b1b63..8f792f9 100644
--- a/extend/catcher/generate/factory/SQL.php
+++ b/extend/catcher/generate/factory/SQL.php
@@ -12,12 +12,11 @@ class SQL extends Factory
 
     public function done($params)
     {
-        //dd($this->createSQL($params));
         Db::execute($this->createSQL($params));
 
         // 判断表是否创建成功
         if (!$this->hasTableExists($params['table'])) {
-            throw new FailedException(sprintf('create table [%s] failed',$params['table']));
+            throw new FailedException(sprintf('create table [%s] failed', $params['table']));
         }
 
         return true;
@@ -36,7 +35,7 @@ class SQL extends Factory
             throw new FailedException('table name has lost~');
         }
 
-        if ($table = $this->hasTableExists($params['table'])) {
+        if ($this->hasTableExists($params['table'])) {
             throw new FailedException(sprintf('table [%s] has existed', $params['table']));
         }
 
@@ -70,7 +69,7 @@ class SQL extends Factory
         }
         $createSql = rtrim($createSql, ',' . PHP_EOL);
         // 创建表 SQL
-        return $this->createTable($table, $createSql, $extra['engine'], 'utf8mb4', $extra['comment']);
+        return $this->createTable($params['table'], $createSql, $extra['engine'], 'utf8mb4', $extra['comment']);
     }
 
     /**
@@ -102,9 +101,14 @@ class SQL extends Factory
             if (!$sql['default']) {
                 $_sql[] = ' default \'\'';
             } else {
-                $_sql[] = ' default ' . $sql['default'];
+                if (strpos('int', $sql['type']) === false) {
+                    $_sql[] = ' default "' . $sql['default'] . '"';
+                } else {
+                    $_sql[] = ' default ' . $sql['default'];
+                }
             }
         }
+
         // 字段注释
         $_sql[] = $sql['comment'] ? sprintf('comment \'%s\'', $sql['comment']) : '';