From a14f41f34543bc81c10b4660500dd8ee22aee1b3 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 12 Aug 2008 16:28:52 +0000 Subject: [PATCH] Fixed #8260 -- Changed [8318] to also work with MySQLdb 1.2.1p2. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8329 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/mysql/base.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 8afaa1f03c7..7475f5d1f78 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -50,13 +50,19 @@ django_conversions.update({ FIELD_TYPE.TIME: util.typecast_time, FIELD_TYPE.DECIMAL: util.typecast_decimal, FIELD_TYPE.NEWDECIMAL: util.typecast_decimal, - # By default, mysqldb will return VARCHAR BINARY fields as type str. +}) +if hasattr(FIELD_TYPE, "VARCHAR"): + # By default, MySQLdb will return VARCHAR BINARY fields as type str. # This is a bad idea, as BINARY doesn't indicate that it's arbitrary # binary data, but that collation uses the binary representation. # Replacing the list makes it return unicode. MySQLdb later adds # another list entry for non-binary fields. - FIELD_TYPE.VARCHAR: [(FLAG.BINARY, lambda s: s.decode('utf-8'))], -}) + # + # MySQLdb 1.2.1p2 doesn't have the VARCHAR attribute, but it also returns + # unicode for VARCHAR BINARY columns automatically, so we don't need it + # there. + django_conversions[FIELD_TYPE.VARCHAR] = [(FLAG.BINARY, + lambda s: s.decode('utf-8'))] # This should match the numerical portion of the version numbers (we can treat # versions like 5.0.24 and 5.0.24a as the same). Based on the list of version