diff options
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/mysqlconnector.py | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index a74b20ac4..43553a69c 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2449,7 +2449,7 @@ class MySQLDialect(default.DefaultDialect): cursor.execute('SELECT @@tx_isolation') val = cursor.fetchone()[0] cursor.close() - if util.py3k and isinstance(val, bytes): + if util.py3k and isinstance(val, util.all_binary_types): val = val.decode() return val.upper().replace("-", " ") @@ -3358,7 +3358,7 @@ class _DecodingRowProxy(object): if isinstance(item, _array): item = item.tostring() - if self.charset and isinstance(item, util.binary_type): + if self.charset and isinstance(item, util.all_binary_types): return item.decode(self.charset) else: return item @@ -3367,7 +3367,7 @@ class _DecodingRowProxy(object): item = getattr(self.rowproxy, attr) if isinstance(item, _array): item = item.tostring() - if self.charset and isinstance(item, util.binary_type): + if self.charset and isinstance(item, util.all_binary_types): 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 97fd0ccdf..cc474074e 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py +++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py @@ -115,6 +115,14 @@ class MySQLDialect_mysqlconnector(MySQLDialect): util.coerce_kw_type(opts, 'buffered', bool) util.coerce_kw_type(opts, 'raise_on_warnings', bool) + # TODO: not do this, but we can't really support "raw" + # mode which is what this is + # if not util.coerce_kw_type(opts, 'use_unicode', bool): + # raise Exception("use unicode=0 is not supported") + + # TODO: this? + util.coerce_kw_type(opts, 'charset', str) + # unfortunately, MySQL/connector python refuses to release a # cursor without reading fully, so non-buffered isn't an option opts.setdefault('buffered', True) |