summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2010-03-09 14:49:50 +0000
committerKaren Tracey <kmtracey@gmail.com>2010-03-09 14:49:50 +0000
commit0a7ec91dc3fb03502a38ea501f2b24f5730c484c (patch)
tree298029e4e9b3f76238271e4ccd621f514cb7a819
parent89c263932378fa4b370ab28ef7658472f31643e0 (diff)
[1.1.X] Changed last_executed_query to avoid raising exceptions on non-utf8-encoded parameter data.
r12737 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/__init__.py b/django/db/backends/__init__.py
index 9a1fe30925..f4a64957ec 100644
--- a/django/db/backends/__init__.py
+++ b/django/db/backends/__init__.py
@@ -208,7 +208,7 @@ class BaseDatabaseOperations(object):
from django.utils.encoding import smart_unicode, force_unicode
# Convert params to contain Unicode values.
- to_unicode = lambda s: force_unicode(s, strings_only=True)
+ to_unicode = lambda s: force_unicode(s, strings_only=True, errors='replace')
if isinstance(params, (list, tuple)):
u_params = tuple([to_unicode(val) for val in params])
else: