Merge pull request #1163 from ADOdb:1162-mysqli-metadatabases-returns-empty-result-set-if-fetch-mode-is-adodb_fetch_num

Change structure of metadatabase record iteration to not match associative keys

1 files changed, 19 insertions, 9 deletions

diff --git a/drivers/adodb-mysqli.inc.php b/drivers/adodb-mysqli.inc.php
index 36a3f207..6cb621f2 100644
--- a/drivers/adodb-mysqli.inc.php
+++ b/drivers/adodb-mysqli.inc.php
@@ -634,17 +634,27 @@ class ADODB_mysqli extends ADOConnection {
 	function MetaDatabases()
 	{
 		$query = "SHOW DATABASES";
-		$ret = $this->execute($query);
-		if ($ret && is_object($ret)){
-			$arr = array();
-			while (!$ret->EOF){
-				$db = $ret->fields('Database');
-				if ($db != 'mysql') $arr[] = $db;
-				$ret->moveNext();
+		$result = $this->getAll($query);
+		
+		if (!$result) {
+			return false;
+		}
+
+		$systemDatabases = array(
+			'mysql',
+			'information_schema',
+			'performance_schema'
+		);
+	
+		$databaseList = [];
+		foreach ($result as $dbArray) {
+			$databaseName = array_pop($dbArray);
+			if (!in_array($databaseName, $systemDatabases)) {
+				$databaseList[] = $databaseName;
 			}
-			return $arr;
 		}
-		return $ret;
+
+		return $databaseList;
 	}
 
 	/**