0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码生成

Browse Source
This commit is contained in:
JaguarJack 2020-06-30 10:14:27 +08:00
parent 051627547e
commit 2b4f9823ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extend/catcher/generate/factory/Model.php
View File

@ -74,8 +74,7 @@ class Model extends Factory
return false; return false;
} }
$columns = Db::query('show full columns from ' . $columns = Db::query('show full columns from ' . $table);
config('database.connections.mysql.prefix') . $table);
$new = []; $new = [];
foreach ($columns as $field) { foreach ($columns as $field) {

7
extend/catcher/generate/factory/SQL.php
View File

@ -96,15 +96,16 @@ class SQL extends Factory
$_sql[] = 'unsigned'; $_sql[] = 'unsigned';
} }
// 默认值 // 默认值
$default = trim(trim($sql['default'], '\''));
if (!$sql['nullable']) { if (!$sql['nullable']) {
$_sql[] = 'not null'; $_sql[] = 'not null';
if (!$sql['default']) { if (!$default) {
$_sql[] = ' default \'\''; $_sql[] = ' default \'\'';
} else { } else {
if (strpos('int', $sql['type']) === false) { if (strpos('int', $sql['type']) === false) {
$_sql[] = ' default "' . $sql['default'] . '"'; $_sql[] = ' default "' . $default . '"';
} else { } else {
$_sql[] = ' default ' . $sql['default']; $_sql[] = ' default ' . $default;
} }
} }
} }