From 48f572168f9962e688aa8fc3027633d548f85ce5 Mon Sep 17 00:00:00 2001 From: yanwenwu Date: Tue, 19 May 2020 11:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=AE=9A=E4=B9=89ta?= =?UTF-8?q?ble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/catcher/generate/factory/Factory.php | 4 +++- extend/catcher/generate/factory/SQL.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extend/catcher/generate/factory/Factory.php b/extend/catcher/generate/factory/Factory.php index 29e3707..1519ed1 100644 --- a/extend/catcher/generate/factory/Factory.php +++ b/extend/catcher/generate/factory/Factory.php @@ -93,6 +93,8 @@ abstract class Factory { $tables = Db::getConnection()->getTables(); - return in_array(\config('database.connections.mysql.prefix') . $table, $tables); + $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 37bb078..51b1b63 100644 --- a/extend/catcher/generate/factory/SQL.php +++ b/extend/catcher/generate/factory/SQL.php @@ -36,7 +36,7 @@ class SQL extends Factory throw new FailedException('table name has lost~'); } - if ($this->hasTableExists($params['table'])) { + if ($table = $this->hasTableExists($params['table'])) { throw new FailedException(sprintf('table [%s] has existed', $params['table'])); }