Merge pull request #2213 from MGatner/list-tables-cached

Filter listTables cache response on constrainPrefix
codeigniter4 · Sep 17, 2019 · 4684036 · 4684036
2 parents f2bf43b + 8b539a6
commit 4684036
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
@@ -1528,7 +1528,9 @@ public function listTables(bool $constrainByPrefix = false)
 		// Is there a cached result?
 		if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])
 		{
-			return $this->dataCache['table_names'];
+			return $constrainByPrefix ?
+				preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])
+				: $this->dataCache['table_names'];
 		}
 
 		if (false === ($sql = $this->_listTables($constrainByPrefix)))