Skip to content

Commit 20d4635

Browse files
authored
Add files via upload
1 parent 2cb661f commit 20d4635

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/Commands/MakeModelCommand.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,15 @@ protected function createTpModel($class, $namespace, $file)
134134
$table = Util::classToName($class);
135135
$table_val = 'null';
136136
$pk = 'id';
137-
$prefix = config('thinkorm.connections.mysql.prefix') ?? '';
138-
if (\think\facade\Db::query("show tables like '{$prefix}{$table}'")) {
139-
$table = "{$prefix}{$table}";
140-
$table_val = "'$table'";
141-
} else if (\think\facade\Db::query("show tables like '{$prefix}{$table}s'")) {
142-
$table = "{$prefix}{$table}s";
143-
$table_val = "'$table'";
144-
}
145137
try {
138+
$prefix = config('thinkorm.connections.mysql.prefix') ?? '';
139+
if (\think\facade\Db::query("show tables like '{$prefix}{$table}'")) {
140+
$table = "{$prefix}{$table}";
141+
$table_val = "'$table'";
142+
} else if (\think\facade\Db::query("show tables like '{$prefix}{$table}s'")) {
143+
$table = "{$prefix}{$table}s";
144+
$table_val = "'$table'";
145+
}
146146
foreach (\think\facade\Db::query("desc `$table`") as $item) {
147147
if ($item['Key'] === 'PRI') {
148148
$pk = $item['Field'];

0 commit comments

Comments
 (0)