Fix #1127 Schema->hasTable and Schema->hasView does not support yii-quoted names (#1128)

batyrmastyr · samdark · Copilot · web-flow · commit 85742a8d1e00 · 2025-12-11T14:03:18.000+07:00
* Fix #1127 Schema->hasTable and Schema->hasView does not support yii-quoted names * Update CHANGELOG.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update CHANGELOG.md Co-authored-by: Sergei Tigrov <rrr-r@ya.ru> * Update CHANGELOG.md Co-authored-by: Sergei Predvoditelev <sergey.predvoditelev@gmail.com> * Update tests/Common/CommonSchemaTest.php Co-authored-by: Sergei Predvoditelev <sergey.predvoditelev@gmail.com> --------- Co-authored-by: Alexander Makarov <sam@rmcreative.ru> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Sergei Tigrov <rrr-r@ya.ru> Co-authored-by: Sergei Predvoditelev <sergey.predvoditelev@gmail.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## 2.0.1 under development
 
-- no changes in this release.
+- Bug #1127: Fix `AbstractSchema::hasTable()` and `AbstractSchema::hasView()` methods to support names quoted with curly
+  brackets `{{%table}}` (@batyrmastyr)
 
 ## 2.0.0 December 05, 2025
 
diff --git a/src/Schema/AbstractSchema.php b/src/Schema/AbstractSchema.php
@@ -270,8 +270,9 @@ public function getViewNames(string $schema = '', bool $refresh = false): array
     public function hasTable(string $tableName, string $schema = '', bool $refresh = false): bool
     {
         $tables = $this->getTableNames($schema, $refresh);
+        $rawTableName = $this->db->getQuoter()->getRawTableName($tableName);
 
-        return in_array($tableName, $tables);
+        return in_array($rawTableName, $tables);
     }
 
     public function hasSchema(string $schema, bool $refresh = false): bool
@@ -284,8 +285,9 @@ public function hasSchema(string $schema, bool $refresh = false): bool
     public function hasView(string $viewName, string $schema = '', bool $refresh = false): bool
     {
         $views = $this->getViewNames($schema, $refresh);
+        $rawViewName = $this->db->getQuoter()->getRawTableName($viewName);
 
-        return in_array($viewName, $views);
+        return in_array($rawViewName, $views);
     }
 
     /**
diff --git a/tests/Common/CommonSchemaTest.php b/tests/Common/CommonSchemaTest.php
@@ -283,6 +283,8 @@ public function testHasTable(): void
         $schema = $db->getSchema();
 
         $tempTableName = 'testTemporaryTable';
+        $this->dropTable('testTemporaryTable');
+
         $db->createCommand()
             ->createTable(
                 $tempTableName,
@@ -294,7 +296,8 @@ public function testHasTable(): void
             ->execute();
 
         $this->assertTrue($schema->hasTable('order'));
-        $this->assertTrue($schema->hasTable($tempTableName));
+        $this->assertTrue($schema->hasTable($tempTableName), 'raw new table name');
+        $this->assertTrue($schema->hasTable('{{%' . $tempTableName . '}}'), 'quoted new table name');
         $this->assertFalse($schema->hasTable('no_such_table'));
 
         $db->createCommand()->dropTable($tempTableName)->execute();
@@ -409,6 +412,7 @@ public function testHasView(): void
 
         $this->assertTrue($schema->hasView('v1'));
         $this->assertTrue($schema->hasView('v2'));
+        $this->assertTrue($schema->hasView('{{%v2}}'), 'quoted view name');
         $this->assertFalse($schema->hasView('v3'));
 
         $db->createCommand()->dropView('v1')->execute();

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,9 @@ public function getViewNames(string $schema = '', bool $refresh = false): array`
`270`	`270`	`public function hasTable(string $tableName, string $schema = '', bool $refresh = false): bool`
`271`	`271`	`{`
`272`	`272`	`$tables = $this->getTableNames($schema, $refresh);`
	`273`	`+ $rawTableName = $this->db->getQuoter()->getRawTableName($tableName);`
`273`	`274`
`274`		`- return in_array($tableName, $tables);`
	`275`	`+ return in_array($rawTableName, $tables);`
`275`	`276`	`}`
`276`	`277`
`277`	`278`	`public function hasSchema(string $schema, bool $refresh = false): bool`
`@@ -284,8 +285,9 @@ public function hasSchema(string $schema, bool $refresh = false): bool`
`284`	`285`	`public function hasView(string $viewName, string $schema = '', bool $refresh = false): bool`
`285`	`286`	`{`
`286`	`287`	`$views = $this->getViewNames($schema, $refresh);`
	`288`	`+ $rawViewName = $this->db->getQuoter()->getRawTableName($viewName);`
`287`	`289`
`288`		`- return in_array($viewName, $views);`
	`290`	`+ return in_array($rawViewName, $views);`
`289`	`291`	`}`
`290`	`292`
`291`	`293`	`/**`