From 670a153f4ec7d15bfcd39f614f854407fc51e880 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 15 Jan 2009 16:38:17 +0000 Subject: [PATCH] convert_unicode by default clears up the issue for now --- lib/sqlalchemy/connectors/pyodbc.py | 1 - lib/sqlalchemy/dialects/mysql/pyodbc.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/connectors/pyodbc.py b/lib/sqlalchemy/connectors/pyodbc.py index 590971bd6f..1204cfbfd3 100644 --- a/lib/sqlalchemy/connectors/pyodbc.py +++ b/lib/sqlalchemy/connectors/pyodbc.py @@ -53,7 +53,6 @@ class PyODBCConnector(Connector): connectors.append("AutoTranslate=%s" % keys.pop("odbc_autotranslate")) connectors.extend(['%s=%s' % (k,v) for k,v in keys.iteritems()]) - return [[";".join (connectors)], {}] def is_disconnect(self, e): diff --git a/lib/sqlalchemy/dialects/mysql/pyodbc.py b/lib/sqlalchemy/dialects/mysql/pyodbc.py index b6f428ed26..4eb7657073 100644 --- a/lib/sqlalchemy/dialects/mysql/pyodbc.py +++ b/lib/sqlalchemy/dialects/mysql/pyodbc.py @@ -14,6 +14,8 @@ class MySQL_pyodbc(PyODBCConnector, MySQLDialect): execution_ctx_cls = MySQL_pyodbcExecutionContext def __init__(self, **kw): + # deal with http://code.google.com/p/pyodbc/issues/detail?id=25 + kw.setdefault('convert_unicode', True) MySQLDialect.__init__(self, **kw) PyODBCConnector.__init__(self, **kw) -- 2.47.3