From 57f7788ec2ea0de56137c8ac6909948e2ae91489 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 20 Oct 2017 16:07:49 -0400 Subject: 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 --- lib/sqlalchemy/dialects/mysql/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy') 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 -- cgit v1.2.1