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; } } }