summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-02-03 07:31:00 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-02-03 07:31:00 +0000
commitb740534dc4c68a6b4d30eef96f4d7f70c17c9e0d (patch)
tree4265e437a1cb7491c2b07cb14dbe76b710aaf671
parent8e5c116971f519a4de2cf0a2f178bf990301e38b (diff)
Fixed a regression in the Postgres psycopg cursor handling introduced by r12352. Thanks to Kenneth Gonsalves for the report, and Karen for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/postgresql/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index 85b2acb9d2..5681311a65 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -54,7 +54,7 @@ class UnicodeCursorWrapper(object):
def execute(self, sql, params=()):
try:
- return self.cursor.execute(sql, params)
+ return self.cursor.execute(smart_str(sql, self.charset), self.format_params(params))
except Database.IntegrityError, e:
raise utils.IntegrityError, utils.IntegrityError(*tuple(e)), sys.exc_info()[2]
except Database.DatabaseError, e: