diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-20 12:07:00 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-20 12:07:00 -0400 |
| commit | 834973092c1b763a4c67da9797a398981ac449ea (patch) | |
| tree | 3d8b1ec476f847294a2679ac13fcc98331cb1c35 /lib/sqlalchemy/dialects/mysql/base.py | |
| parent | 2feb40d0a48dd424c38a37e70a63a6bcf3c00c02 (diff) | |
| parent | 6e8ecd161bfb95b39713ba406921fb277b2802a3 (diff) | |
| download | sqlalchemy-834973092c1b763a4c67da9797a398981ac449ea.tar.gz | |
Merge branch 'support-emoji-on-mysql' of https://bitbucket.org/graingert/sqlalchemy into pr49
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/base.py')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 8933e0b70..5647c38f2 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -3298,9 +3298,17 @@ class _DecodingRowProxy(object): # sets.Set(['value']) (seriously) but thankfully that doesn't # seem to come up in DDL queries. + _encoding_compat = { + 'koi8r': 'koi8_r', + 'koi8u': 'koi8_u', + 'utf16': 'utf-16-be', # MySQL's uft16 is always bigendian + 'utf8mb4': 'utf8', # real utf8 + 'eucjpms': 'ujis', + } + def __init__(self, rowproxy, charset): self.rowproxy = rowproxy - self.charset = charset + self.charset = self._encoding_compat.get(charset, charset) def __getitem__(self, index): item = self.rowproxy[index] |