Add additional parsing to extract the "MariaDB" keyword from version string

Enhanced MySQL/MariaDB version string parsing to accommodate for exotic
MariaDB version strings where the "MariaDB" word is embedded among other
alphanumeric characters such as "MariaDBV1".   This detection is critical in
order to correctly accomodate for API features that have split between MySQL
and MariaDB such as the "transaction_isolation" system variable.

Fixes: #4624
Change-Id: Iba4b56535855629a974b1e24e012b07383d24199

diff --git a/doc/build/changelog/unreleased_13/4624.rst b/doc/build/changelog/unreleased_13/4624.rst
new file mode 100644 (file)
index 0000000..4e8fc49
--- /dev/null
+++ b/doc/build/changelog/unreleased_13/4624.rst
@@ -0,0 +1,10 @@
+.. change::
+   :tags: bug, mysql
+   :tickets: 4624
+
+   Enhanced MySQL/MariaDB version string parsing to accommodate for exotic
+   MariaDB version strings where the "MariaDB" word is embedded among other
+   alphanumeric characters such as "MariaDBV1".   This detection is critical in
+   order to correctly accomodate for API features that have split between MySQL
+   and MariaDB such as the "transaction_isolation" system variable.
+

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 5725b1f05b22e8067fa125d342be2578b59bcd92..9d83541ae48d53f7df6080a33e532fda9311211c 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2193,13 +2193,20 @@ class MySQLDialect(default.DefaultDialect):
         if util.py3k and isinstance(val, bytes):
             val = val.decode()
 
+        return self._parse_server_version(val)
+
+    def _parse_server_version(self, val):
         version = []
         r = re.compile(r"[.\-]")
         for n in r.split(val):
             try:
                 version.append(int(n))
             except ValueError:
-                version.append(n)
+                mariadb = re.match(r"(.*)(MariaDB)(.*)", n)
+                if mariadb:
+                    version.extend(g for g in mariadb.groups() if g)
+                else:
+                    version.append(n)
         return tuple(version)
 
     def do_commit(self, dbapi_connection):

diff --git a/test/dialect/mysql/test_dialect.py b/test/dialect/mysql/test_dialect.py
index 8d0d60f1b57f2755972edb45700d5f4eea33f5c8..3005e459b9a50c25fb686fb87b5c39150fac752b 100644 (file)
--- a/test/dialect/mysql/test_dialect.py
+++ b/test/dialect/mysql/test_dialect.py
@@ -192,20 +192,35 @@ class DialectTest(fixtures.TestBase):
 
 class ParseVersionTest(fixtures.TestBase):
     def test_mariadb_normalized_version(self):
-        for expected, version in [
-            ((10, 2, 7), (10, 2, 7, "MariaDB")),
-            ((10, 2, 7), (5, 6, 15, 10, 2, 7, "MariaDB")),
-            ((10, 2, 10), (10, 2, 10, "MariaDB")),
-            ((5, 7, 20), (5, 7, 20)),
-            ((5, 6, 15), (5, 6, 15)),
+        for expected, raw_version, version, is_mariadb in [
+            ((10, 2, 7), "10.2.7-MariaDB", (10, 2, 7, "MariaDB"), True),
+            (
+                (10, 2, 7),
+                "5.6.15.10.2.7-MariaDB",
+                (5, 6, 15, 10, 2, 7, "MariaDB"),
+                True,
+            ),
+            ((10, 2, 10), "10.2.10-MariaDB", (10, 2, 10, "MariaDB"), True),
+            ((5, 7, 20), "5.7.20", (5, 7, 20), False),
+            ((5, 6, 15), "5.6.15", (5, 6, 15), False),
             (
                 (10, 2, 6),
+                "10.2.6.MariaDB.10.2.6+maria~stretch-log",
                 (10, 2, 6, "MariaDB", 10, 2, "6+maria~stretch", "log"),
+                True,
+            ),
+            (
+                (10, 1, 9),
+                "10.1.9-MariaDBV1.0R050D002-20170809-1522",
+                (10, 1, 9, "MariaDB", "V1", "0R050D002", 20170809, 1522),
+                True,
             ),
         ]:
             dialect = mysql.dialect()
+            eq_(dialect._parse_server_version(raw_version), version)
             dialect.server_version_info = version
             eq_(dialect._mariadb_normalized_version_info, expected)
+            assert dialect._is_mariadb is is_mariadb
 
     def test_mariadb_check_warning(self):