Fixes #12002 and #12030 - azure fallback to "select @@Version" (#12551)

* Fixes #12002 and #12030 - azure fallback to "select @@Version" * Add comment for why @@Version is used instead of going through the connection object.
matomo-org · Apr 23, 2018 · 718eb0e · 718eb0e
1 parent 12f4519
commit 718eb0e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/core/Db/Adapter/Mysqli.php b/core/Db/Adapter/Mysqli.php
@@ -98,6 +98,24 @@ public function checkServerVersion()
         }
     }
 
+    /**
+     * Returns the MySQL server version
+     *
+     * @return null|string
+     */
+    public function getServerVersion()
+    {
+        // prioritizing SELECT @@VERSION in case the connection version string is incorrect (which can
+        // occur on Azure)
+        $versionInfo = $this->fetchAll('SELECT @@VERSION');
+
+        if (count($versionInfo)) {
+            return $versionInfo[0]['@@VERSION'];
+        }
+
+        return parent::getServerVersion();
+    }
+
     /**
      * Check client version compatibility against database server
      *

diff --git a/core/Db/Adapter/Pdo/Mysql.php b/core/Db/Adapter/Pdo/Mysql.php
@@ -134,6 +134,24 @@ public function checkServerVersion()
         }
     }
 
+    /**
+     * Returns the MySQL server version
+     *
+     * @return null|string
+     */
+    public function getServerVersion()
+    {
+        // prioritizing SELECT @@VERSION in case the connection version string is incorrect (which can
+        // occur on Azure)
+        $versionInfo = $this->fetchAll('SELECT @@VERSION');
+
+        if (count($versionInfo)) {
+            return $versionInfo[0]['@@VERSION'];
+        }
+
+        return parent::getServerVersion();
+    }
+
     /**
      * Check client version compatibility against database server
      *