Filter listTables cache response on constrainPrefix

MGatner · web-flow · commit 8b539a675a3c · 2019-09-11T15:52:09.000-04:00
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)))

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,9 @@ public function listTables(bool $constrainByPrefix = false)`
`1528`	`1528`	`// Is there a cached result?`
`1529`	`1529`	`if (isset($this->dataCache['table_names']) && $this->dataCache['table_names'])`
`1530`	`1530`	`{`
`1531`		`- return $this->dataCache['table_names'];`
	`1531`	`+ return $constrainByPrefix ?`
	`1532`	`+ preg_grep("/^{$this->DBPrefix}/", $this->dataCache['table_names'])`
	`1533`	`+ : $this->dataCache['table_names'];`
`1532`	`1534`	`}`
`1533`	`1535`
`1534`	`1536`	`if (false === ($sql = $this->_listTables($constrainByPrefix)))`