Skip to content

fix: preserve cached table list shape #10179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulbalandan merged 2 commits into from
May 11, 2026
+24 −3
Merged

fix: preserve cached table list shape #10179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2437f2c
fix: preserve cached table list shape
memleakd May 9, 2026
9a4613b
docs: add changelog entry for cached table list fix
memleakd May 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,9 +1684,11 @@ protected function getDriverFunctionPrefix(): string
public function listTables(bool $constrainByPrefix = false)
{
if (isset($this->dataCache['table_names']) && $this->dataCache['table_names']) {
return $constrainByPrefix
$tables = $constrainByPrefix
? preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
: $this->dataCache['table_names'];

return array_values($tables);
}

$sql = $this->_listTables($constrainByPrefix);
Expand Down
20 changes: 19 additions & 1 deletion tests/system/Database/Live/MetadataTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ private function dropExtraneousTable(): void
$oldPrefix = $this->db->getPrefix();
$this->db->setPrefix('tmp_');

Database::forge($this->DBGroup)->dropTable('widgets');
Database::forge($this->DBGroup)->dropTable('widgets', true);

$this->db->setPrefix($oldPrefix);
}
Expand Down Expand Up @@ -139,4 +139,22 @@ public function testListTablesConstrainedByExtraneousPrefixReturnsOnlyTheExtrane
$this->dropExtraneousTable();
}
}

public function testListTablesReturnsListAfterCachedTableIsDropped(): void
{
try {
$this->createExtraneousTable();

$tables = $this->db->listTables();
$this->assertSame(array_values($tables), $tables);

$this->dropExtraneousTable();

$tables = $this->db->listTables();
$this->assertSame(array_values($tables), $tables);
$this->assertNotContains('tmp_widgets', $tables);
} finally {
$this->dropExtraneousTable();
}
}
}
Loading