Fix issue where AbstractSchema::refresh() didn't completely clear cache (#1099)

vjik · web-flow · commit c6c05b681e9b · 2025-11-20T04:50:03.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -173,6 +173,7 @@
 - New #1082: Add `QueryPartsInterface::addWithQuery()` method (@vjik)
 - Chg #1082: `QueryPartsInterface::withQuery()` method replace "WITH" clause instead of adding before (@vjik)
 - Enh #1092: Change the exceptions thrown to be more appropriate (@Tigrov)
+- Bug #1099: Fix an issue where `AbstractSchema::refresh()` didn't completely clear cache (@vjik) 
 
 ## 1.3.0 March 21, 2024
 
diff --git a/src/Schema/AbstractSchema.php b/src/Schema/AbstractSchema.php
@@ -233,6 +233,9 @@ public function refresh(): void
 
         $this->tableNames = [];
         $this->tableMetadata = [];
+        $this->schemaNames = [];
+        $this->viewNames = [];
+        $this->resultColumns = [];
     }
 
     public function refreshTableSchema(string $name): void
diff --git a/tests/AbstractSchemaTest.php b/tests/AbstractSchemaTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Db\Constant\DataType;
+use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Tests\Support\Assert;
 use Yiisoft\Db\Tests\Support\TestTrait;
 
@@ -61,14 +62,21 @@ public function testGetDataType(): void
 
     public function testRefresh(): void
     {
-        $db = $this->getConnection();
-
+        $db = $this->getConnection(true);
         $schema = $db->getSchema();
-        $schema->refresh();
 
-        $db->close();
+        try {
+            $this->assertNotEmpty($schema->getTableNames());
+            $this->assertNotEmpty($schema->getViewNames());
+            $this->assertNotEmpty($schema->getSchemaNames());
+        } catch (NotSupportedException) {
+        }
+
+        $schema->refresh();
 
         $this->assertSame([], Assert::getPropertyValue($schema, 'tableMetadata'));
         $this->assertSame([], Assert::getPropertyValue($schema, 'tableNames'));
+        $this->assertSame([], Assert::getPropertyValue($schema, 'schemaNames'));
+        $this->assertSame([], Assert::getPropertyValue($schema, 'viewNames'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,9 @@ public function refresh(): void`
`233`	`233`
`234`	`234`	`$this->tableNames = [];`
`235`	`235`	`$this->tableMetadata = [];`
	`236`	`+ $this->schemaNames = [];`
	`237`	`+ $this->viewNames = [];`
	`238`	`+ $this->resultColumns = [];`
`236`	`239`	`}`
`237`	`240`
`238`	`241`	`public function refreshTableSchema(string $name): void`