Don't convert binary varchar columns to unicode.

Patch 1387290
This commit is contained in:
adustman
2006-02-25 00:43:09 +00:00
parent 6cebc27929
commit c1e9fbc54b
2 changed files with 10 additions and 2 deletions

View File

@ -138,8 +138,8 @@ class Connection(_mysql.connection):
if use_unicode: if use_unicode:
def u(s): def u(s):
return s.decode(self.charset) return s.decode(self.charset)
conv[FIELD_TYPE.STRING] = u conv[FIELD_TYPE.STRING].insert(-1, (None, u))
conv[FIELD_TYPE.VAR_STRING] = u conv[FIELD_TYPE.VAR_STRING].insert(-1, (None, u))
conv[FIELD_TYPE.BLOB].insert(-1, (None, u)) conv[FIELD_TYPE.BLOB].insert(-1, (None, u))
def string_literal(obj, dummy=None): def string_literal(obj, dummy=None):

View File

@ -141,6 +141,14 @@ conversions = {
(FLAG.BINARY, char_array), (FLAG.BINARY, char_array),
(None, None), (None, None),
], ],
FIELD_TYPE.STRING: [
(FLAG.BINARY, char_array),
(None, None),
],
FIELD_TYPE.VAR_STRING: [
(FLAG.BINARY, char_array),
(None, None),
],
} }
try: try: