- fix mysqlconnector import

- mysqlconnector returns get_server_version() as a tuple-ready structure

diff --git a/lib/sqlalchemy/dialects/mysql/__init__.py b/lib/sqlalchemy/dialects/mysql/__init__.py
index 1685295162dd813b47b2d2d7adf793b00a72fe4d..e4ecccdfc744b4666b53c6744f7e36f433037c49 100644 (file)
--- 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 ac102f94a3c281fe20ddf1c71f123432cf4e0fca..3ac207109f90fcc72f3a666d109569235e3e9727 100644 (file)
--- 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):