summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-10-20 16:07:49 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-10-20 16:08:47 -0400
commit57f7788ec2ea0de56137c8ac6909948e2ae91489 (patch)
tree979c661afad613a20dd743d07cbb43b870f49f69 /lib/sqlalchemy
parent55b511c3960cad636ff1e512594368a36a85ce5c (diff)
downloadsqlalchemy-57f7788ec2ea0de56137c8ac6909948e2ae91489.tar.gz
Get MariaDB normalized version relative to "MariaDB" token
Fixed regression from 1.2.0b3 where "MariaDB" version comparison can fail for some particular MariaDB version strings under Python 3. Change-Id: Iedf49f40c1614ccedf63e0fa26719dd704da104d Fixes: #4115
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 5f0b45a45..5acb9a005 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1894,8 +1894,9 @@ class MySQLDialect(default.DefaultDialect):
@property
def _mariadb_normalized_version_info(self):
- if len(self.server_version_info) > 5:
- return self.server_version_info[3:]
+ if self._is_mariadb:
+ idx = self.server_version_info.index('MariaDB')
+ return self.server_version_info[idx - 3: idx]
else:
return self.server_version_info