From 2b4f9823ffe7145a590a8d2ec04973b11e85354c Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 30 Jun 2020 10:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/generate/factory/Model.php | 3 +--
 extend/catcher/generate/factory/SQL.php   | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extend/catcher/generate/factory/Model.php b/extend/catcher/generate/factory/Model.php
index cc1fdd2..76cf4be 100644
--- a/extend/catcher/generate/factory/Model.php
+++ b/extend/catcher/generate/factory/Model.php
@@ -74,8 +74,7 @@ class Model extends Factory
             return false;
         }
 
-        $columns = Db::query('show full columns from ' .
-            config('database.connections.mysql.prefix') . $table);
+        $columns = Db::query('show full columns from ' . $table);
 
         $new = [];
         foreach ($columns as $field) {
diff --git a/extend/catcher/generate/factory/SQL.php b/extend/catcher/generate/factory/SQL.php
index 8f792f9..1a98eff 100644
--- a/extend/catcher/generate/factory/SQL.php
+++ b/extend/catcher/generate/factory/SQL.php
@@ -96,15 +96,16 @@ class SQL extends Factory
             $_sql[] = 'unsigned';
         }
         // 默认值
+        $default = trim(trim($sql['default'], '\''));
         if (!$sql['nullable']) {
             $_sql[] = 'not null';
-            if (!$sql['default']) {
+            if (!$default) {
                 $_sql[] = ' default \'\'';
             } else {
                 if (strpos('int', $sql['type']) === false) {
-                    $_sql[] = ' default "' . $sql['default'] . '"';
+                    $_sql[] = ' default "' . $default . '"';
                 } else {
-                    $_sql[] = ' default ' . $sql['default'];
+                    $_sql[] = ' default ' . $default;
                 }
             }
         }