diff options
author | kesselb <mail@danielkesselberg.de> | 2020-12-02 19:58:13 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 19:58:13 +0300 |
commit | 54822b469b2421a29dbd4aa15d2770c1a49ed588 (patch) | |
tree | 773daab0ac888fc257acbdcd9a983ca93378f07a | |
parent | 2ed82f25a9e622b7e3cbee17e74ac131d777bd4f (diff) | |
parent | 208ae1aec88df99ec1e59f371749a450d99757d0 (diff) |
Merge pull request #256 from nextcloud/bugfix/noid/oraclev21.0.0beta1
Properly fetch oracle database information
-rw-r--r-- | lib/DatabaseStatistics.php | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/DatabaseStatistics.php b/lib/DatabaseStatistics.php index b7694b4..afdd039 100644 --- a/lib/DatabaseStatistics.php +++ b/lib/DatabaseStatistics.php @@ -22,6 +22,7 @@ namespace OCA\ServerInfo; +use Doctrine\DBAL\DBALException; use OCP\IConfig; use OCP\IDBConnection; @@ -60,7 +61,7 @@ class DatabaseStatistics { $sql = 'SELECT sqlite_version() AS version'; break; case 'oci': - $sql = 'SELECT version FROM v$instance'; + $sql = 'SELECT VERSION FROM PRODUCT_COMPONENT_VERSION'; break; case 'mysql': case 'pgsql': @@ -68,11 +69,14 @@ class DatabaseStatistics { $sql = 'SELECT VERSION() AS version'; break; } - $result = $this->connection->executeQuery($sql); - $row = $result->fetch(); - $result->closeCursor(); - if ($row) { - return $this->cleanVersion($row['version']); + try { + $result = $this->connection->executeQuery($sql); + $version = $result->fetchColumn(); + $result->closeCursor(); + if ($version) { + return $this->cleanVersion($version); + } + } catch (DBALException $e) { } return 'N/A'; } @@ -143,7 +147,7 @@ class DatabaseStatistics { $sql = 'SELECT SUM(bytes) as dbsize FROM user_segments'; $result = $this->connection->executeQuery($sql); - $database_size = ($row = $result->fetch()) ? $row['dbsize'] : false; + $database_size = ($row = $result->fetchColumn()) ? (int)$row : false; $result->closeCursor(); break; } |