Fix MySQL database size calculation

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Dec 11, 2020 · 999d64b · 999d64b
1 parent 54822b4
commit 999d64b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/DatabaseStatistics.php b/lib/DatabaseStatistics.php
@@ -95,12 +95,13 @@ protected function databaseSize() {
 		// This code is heavily influenced by a similar routine in phpMyAdmin 2.2.0
 		switch ($this->config->getSystemValue('dbtype')) {
 			case 'mysql':
+				$mysqlEngine = ['MyISAM', 'InnoDB', 'Aria'];
 				$db_name = $this->config->getSystemValue('dbname');
 				$sql = 'SHOW TABLE STATUS FROM `' . $db_name . '`';
 				$result = $this->connection->executeQuery($sql);
 				$database_size = 0;
 				while ($row = $result->fetch()) {
-					if ((isset($row['Type']) && $row['Type'] !== 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] === 'MyISAM' || $row['Engine'] === 'InnoDB'))) {
+					if (isset($row['Engine']) && in_array($row['Engine'], $mysqlEngine)) {
 						$database_size += $row['Data_length'] + $row['Index_length'];
 					}
 				}