p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

0.90-bugfixes: fix for backport in [4418] 

git-svn-id: http://code.djangoproject.com/svn/django/branches/0.90-bugfixes@4452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2007-01-30 19:04:57 +00:00
parent 78217bfc3a
commit eb97c80010
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/db/backends/postgresql.py
View File

@ -47,7 +47,7 @@ class DatabaseWrapper:
self.queries = [] self.queries = []
def cursor(self): def cursor(self):
from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, TIME_ZONE from django.conf.settings import DATABASE_USER, DATABASE_NAME, DATABASE_HOST, DATABASE_PORT, DATABASE_PASSWORD, DEBUG, DEFAULT_CHARSET, TIME_ZONE
if self.connection is None: if self.connection is None:
if DATABASE_NAME == '': if DATABASE_NAME == '':
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -65,7 +65,7 @@ class DatabaseWrapper:
self.connection.set_isolation_level(1) # make transactions transparent to all cursors self.connection.set_isolation_level(1) # make transactions transparent to all cursors
cursor = self.connection.cursor() cursor = self.connection.cursor()
cursor.execute("SET TIME ZONE %s", [TIME_ZONE]) cursor.execute("SET TIME ZONE %s", [TIME_ZONE])
cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET) cursor = UnicodeCursorWrapper(cursor, DEFAULT_CHARSET)
if DEBUG: if DEBUG:
return base.CursorDebugWrapper(cursor, self) return base.CursorDebugWrapper(cursor, self)
return cursor return cursor