From fb48a0b508ded20c9fc29c0cc37f172f14137255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 7 Jul 2021 18:44:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/Db.php  | 6 +++---
 Gii/Gii.php      | 6 +++---
 Gii/GiiModel.php | 6 +++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Database/Db.php b/Database/Db.php
index dd9a599a..72da2298 100644
--- a/Database/Db.php
+++ b/Database/Db.php
@@ -261,7 +261,7 @@ class Db implements ISqlBuilder
 		if (empty($db)) {
 			$db = Snowflake::app()->get('db');
 		}
-		return $db->createCommand('DROP TABLE ' . $table)->delete();
+		return $db->createCommand('DROP TABLE `' . $db->database . '`.' . $table)->delete();
 	}
 
 	/**
@@ -277,7 +277,7 @@ class Db implements ISqlBuilder
 			$db = Snowflake::app()->get('db');
 		}
 
-		return $db->createCommand('TRUNCATE ' . $table)->exec();
+		return $db->createCommand('TRUNCATE `' . $db->database . '`.' . $table)->exec();
 	}
 
 	/**
@@ -317,7 +317,7 @@ class Db implements ISqlBuilder
 			return null;
 		}
 
-		return $db->createCommand('SHOW FULL FIELDS FROM ' . $table)->all();
+		return $db->createCommand('SHOW FULL FIELDS FROM `' . $db->database . '`.' . $table)->all();
 	}
 
 
diff --git a/Gii/Gii.php b/Gii/Gii.php
index 645bc9fb..b52a8a30 100644
--- a/Gii/Gii.php
+++ b/Gii/Gii.php
@@ -12,9 +12,6 @@ namespace Gii;
 use Database\Connection;
 use Database\Db;
 use Exception;
-use JetBrains\PhpStorm\ArrayShape;
-
-use Snowflake\Abstracts\Config;
 use Snowflake\Abstracts\Input;
 use Snowflake\Exception\ComponentException;
 use Snowflake\Exception\ConfigException;
@@ -42,6 +39,9 @@ class Gii
 	public string $controllerNamespace = 'App\\Http\\Controllers\\';
 
 
+	public static array $createSqls = [];
+
+
 	public array $keyword = [
 		'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'ASENSITIVE', 'BEFORE', 'BETWEEN', 'BIGINT', 'BINARY', 'BLOB', 'BOTH', 'BY', 'CALL', 'CASCADE', 'CASE', 'CHANGE', 'CHAR', 'CHARACTER', 'CHECK', 'COLLATE', 'COLUMN', 'CONDITION', 'CONNECTION', 'CONSTRAINT', 'CONTINUE', 'CONVERT', 'CREATE', 'CROSS', 'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER', 'CURSOR', 'DATABASE', 'DATABASES', 'DAY_HOUR', 'DAY_MICROSECOND', 'DAY_MINUTE', 'DAY_SECOND', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DETERMINISTIC', 'DISTINCT', 'DISTINCTROW', 'DIV', 'DOUBLE', 'DROP', 'DUAL', 'EACH', 'ELSE', 'ELSEIF', 'ENCLOSED', 'ESCAPED', 'EXISTS', 'EXIT', 'EXPLAIN', 'FALSE', 'FETCH', 'FLOAT', 'FLOAT4', 'FLOAT8', 'FOR', 'FORCE', 'FOREIGN', 'FROM', 'FULLTEXT', 'GOTO', 'GRANT', 'GROUP', 'HAVING', 'HIGH_PRIORITY', 'HOUR_MICROSECOND', 'HOUR_MINUTE', 'HOUR_SECOND', 'IF', 'IGNORE', 'IN', 'INDEX', 'INFILE', 'INNER', 'INOUT', 'INSENSITIVE', 'INSERT', 'INT', 'INT1', 'INT2', 'INT3', 'INT4', 'INT8', 'INTEGER', 'INTERVAL', 'INTO', 'IS', 'ITERATE', 'JOIN', 'KEY', 'KEYS', 'KILL', 'LABEL', 'LEADING', 'LEAVE', 'LEFT', 'LIKE', 'LIMIT', 'LINEAR', 'LINES', 'LOAD', 'LOCALTIME', 'LOCALTIMESTAMP', 'LOCK', 'LONG', 'LONGBLOB', 'LONGTEXT', 'LOOP', 'LOW_PRIORITY', 'MATCH', 'MEDIUMBLOB', 'MEDIUMINT', 'MEDIUMTEXT', 'MIDDLEINT', 'MINUTE_MICROSECOND', 'MINUTE_SECOND', 'MOD', 'MODIFIES', 'NATURAL', 'NOT', 'NO_WRITE_TO_BINLOG', 'NULL', 'NUMERIC', 'ON', 'OPTIMIZE', 'OPTION', 'OPTIONALLY', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTFILE', 'PRECISION', 'PRIMARY', 'PROCEDURE', 'PURGE', 'RAID0', 'RANGE', 'READ', 'READS', 'REAL', 'REFERENCES', 'REGEXP', 'RELEASE', 'RENAME', 'REPEAT', 'REPLACE', 'REQUIRE', 'RESTRICT', 'RETURN', 'REVOKE', 'RIGHT', 'RLIKE', 'SCHEMA', 'SCHEMAS', 'SECOND_MICROSECOND', 'SELECT', 'SENSITIVE', 'SEPARATOR', 'SET', 'SHOW', 'SMALLINT', 'SPATIAL', 'SPECIFIC', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'SQL_BIG_RESULT', 'SQL_CALC_FOUND_ROWS', 'SQL_SMALL_RESULT', 'SSL', 'STARTING', 'STRAIGHT_JOIN', 'TABLE', 'TERMINATED', 'THEN', 'TINYBLOB', 'TINYINT', 'TINYTEXT', 'TO', 'TRAILING', 'TRIGGER', 'TRUE', 'UNDO', 'UNION', 'UNIQUE', 'UNLOCK', 'UNSIGNED', 'UPDATE', 'USAGE', 'USE', 'USING', 'UTC_DATE', 'UTC_TIME', 'UTC_TIMESTAMP', 'VALUES', 'VARBINARY', 'VARCHAR', 'VARCHARACTER', 'VARYING', 'WHEN', 'WHERE', 'WHILE', 'WITH', 'WRITE', 'X509', 'XOR', 'YEAR_MONTH', 'ZEROFILL'
 	];
diff --git a/Gii/GiiModel.php b/Gii/GiiModel.php
index cf859ec5..5db23fec 100644
--- a/Gii/GiiModel.php
+++ b/Gii/GiiModel.php
@@ -416,6 +416,10 @@ use Database\ActiveRecord;
 	 */
 	private function setCreateSql($table): string
 	{
+		if (isset(Gii::$createSqls[$table])) {
+			return Gii::$createSqls[$table];
+		}
+
 		$text = Db::showCreateSql($table, $this->db)['Create Table'] ?? '';
 
 		$_tmp = [];
@@ -423,7 +427,7 @@ use Database\ActiveRecord;
 			$_tmp[] = '// ' . $val;
 		}
 
-		return implode(PHP_EOL, $_tmp);
+		return Gii::$createSqls[$table] = implode(PHP_EOL, $_tmp);
 	}