diff --git a/Database/Db.php b/Database/Db.php index 36321c1b..eb178466 100644 --- a/Database/Db.php +++ b/Database/Db.php @@ -320,7 +320,7 @@ class Db $table = [' const TABLE = \'select * from %s where REFERENCED_TABLE_NAME=%s\';']; - return $db->createCommand((new Sql()) + return $db->createCommand((new Query()) ->select('*') ->from('INFORMATION_SCHEMA.KEY_COLUMN_USAGE') ->where(['REFERENCED_TABLE_NAME' => $table]) diff --git a/Database/Sql.php b/Database/Query.php similarity index 91% rename from Database/Sql.php rename to Database/Query.php index 7638b9b0..d1b74f78 100644 --- a/Database/Sql.php +++ b/Database/Query.php @@ -14,10 +14,10 @@ use Database\Traits\QueryTrait; use Exception; /** - * Class Sql + * Class Query * @package Database */ -class Sql implements ISqlBuilder +class Query implements ISqlBuilder { use QueryTrait; diff --git a/Database/SqlBuilder.php b/Database/SqlBuilder.php index 34b68e08..bf287646 100644 --- a/Database/SqlBuilder.php +++ b/Database/SqlBuilder.php @@ -20,7 +20,7 @@ class SqlBuilder extends Component use Builder; - public ActiveQuery|Sql|null $query; + public ActiveQuery|Query|null $query; /** diff --git a/Database/Traits/Builder.php b/Database/Traits/Builder.php index f47ee8b7..2877b7be 100644 --- a/Database/Traits/Builder.php +++ b/Database/Traits/Builder.php @@ -8,7 +8,7 @@ use Database\ActiveQuery; use Database\Base\ConditionClassMap; use Database\Condition\HashCondition; use Database\Condition\OrCondition; -use Database\Sql; +use Database\Query; use Database\SqlBuilder; use Exception; use JetBrains\PhpStorm\Pure; @@ -103,10 +103,10 @@ trait Builder } /** - * @param ActiveQuery|Sql $query + * @param ActiveQuery|Query $query * @return string */ - #[Pure] private function builderLimit(ActiveQuery|Sql $query): string + #[Pure] private function builderLimit(ActiveQuery|Query $query): string { if (!is_numeric($query->limit) || $query->limit < 1) { return ""; diff --git a/Database/Traits/QueryTrait.php b/Database/Traits/QueryTrait.php index d0ceccfc..c9a8526b 100644 --- a/Database/Traits/QueryTrait.php +++ b/Database/Traits/QueryTrait.php @@ -14,7 +14,7 @@ use Closure; use Database\ActiveQuery; use Database\ActiveRecord; use Database\Condition\MathematicsCondition; -use Database\Sql; +use Database\Query; use Exception; use JetBrains\PhpStorm\Pure; use ReflectionException; @@ -730,13 +730,13 @@ trait QueryTrait /** - * @return Sql + * @return Query * @throws ReflectionException * @throws NotFindClassException */ - public function makeNewSqlGenerate(): Sql + public function makeNewSqlGenerate(): Query { - return Snowflake::createObject(Sql::class); + return Snowflake::createObject(Query::class); } diff --git a/Database/Traits/When.php b/Database/Traits/When.php index ada3e977..0846bd45 100644 --- a/Database/Traits/When.php +++ b/Database/Traits/When.php @@ -5,7 +5,7 @@ namespace Database\Traits; use Database\ActiveQuery; -use Database\Sql; +use Database\Query; use Exception; use JetBrains\PhpStorm\Pure;