diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 5 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index b9e3080b2..2311b06df 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2504,7 +2504,11 @@ class _DecodingRowProxy(object): item = self.rowproxy[index] if isinstance(item, _array): item = item.tostring() + # Py2K if self.charset and isinstance(item, str): + # end Py2K + # Py3K + #if self.charset and isinstance(item, bytes): return item.decode(self.charset) else: return item @@ -2513,7 +2517,11 @@ class _DecodingRowProxy(object): item = getattr(self.rowproxy, attr) if isinstance(item, _array): item = item.tostring() + # Py2K if self.charset and isinstance(item, str): + # end Py2K + # Py3K + #if self.charset and isinstance(item, bytes): return item.decode(self.charset) else: return item diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py index f715b72df..9e7caae56 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -49,11 +49,10 @@ class _myconnpyBIT(BIT): class MySQL_mysqlconnector(MySQLDialect): driver = 'mysqlconnector' - supports_unicode_statements = False + supports_unicode_statements = True supports_unicode_binds = True - supports_sane_rowcount = False + supports_sane_rowcount = True supports_sane_multi_rowcount = True - description_encoding = None default_paramstyle = 'format' execution_ctx_cls = MySQL_mysqlconnectorExecutionContext |