From f07297e82d56d3ea155578ecff9cdae691b95de5 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 4 Jan 2010 18:41:16 +0000 Subject: [PATCH] - fix mysqlconnector import - mysqlconnector returns get_server_version() as a tuple-ready structure --- lib/sqlalchemy/dialects/mysql/__init__.py | 2 +- lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/dialects/mysql/__init__.py b/lib/sqlalchemy/dialects/mysql/__init__.py index 1685295162..e4ecccdfc7 100644 --- a/lib/sqlalchemy/dialects/mysql/__init__.py +++ b/lib/sqlalchemy/dialects/mysql/__init__.py @@ -1,4 +1,4 @@ -from sqlalchemy.dialects.mysql import base, mysqldb, oursql, pyodbc, zxjdbc, myconnpy +from sqlalchemy.dialects.mysql import base, mysqldb, oursql, pyodbc, zxjdbc, mysqlconnector # default dialect base.dialect = mysqldb.dialect diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py index ac102f94a3..3ac207109f 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -57,13 +57,7 @@ class MySQL_mysqlconnector(MySQLDialect): def _get_server_version_info(self, connection): dbapi_con = connection.connection - version = [] - r = re.compile('[.\-]') - for n in r.split(dbapi_con.get_server_version()): - try: - version.append(int(n)) - except ValueError: - version.append(n) + version = dbapi_con.get_server_version() return tuple(version) def _detect_charset(self, connection): -- 2.47.3