]> git.agnieray.net Git - galette.git/commitdiff
Fix telemetry schema validation for Postgres; closes #1376
authorJohan Cwiklinski <jcwiklinski@teclib.com>
Sun, 15 Dec 2019 09:56:43 +0000 (10:56 +0100)
committerJohan Cwiklinski <jcwiklinski@teclib.com>
Tue, 17 Dec 2019 23:40:17 +0000 (00:40 +0100)
galette/lib/Galette/Core/Db.php

index e32bb3001b0c82db6bc143d6e521af8e9c19fb7a..0e279248f7ae18a76bbe6704791331d5328fc6d1 100644 (file)
@@ -835,7 +835,7 @@ class Db
             'version'   => null,
             'size'      => null,
             'log_size'  => null,
-            'sql_mode'  => null
+            'sql_mode'  => ''
         ];
 
         if ($this->isPostgres()) {
@@ -845,13 +845,10 @@ class Db
                 ->current();
             $infos['version'] = $result['server_version'];
 
-            $total_size = 0;
-            $db_size    = 0;
-
             $sql = 'SELECT pg_database_size(\'' . NAME_DB . '\')';
             $result = $this->db->query($sql, Adapter::QUERY_MODE_EXECUTE)
                 ->current();
-            $infos['size']          = round($result['pg_database_size'] / 1024 / 1024, 1);
+            $infos['size']          = (string)round($result['pg_database_size'] / 1024 / 1024);
         } else {
             $sql = 'SELECT @@sql_mode as mode, @@version AS version, @@version_comment AS version_comment';
             $result = $this->db->query($sql, Adapter::QUERY_MODE_EXECUTE)