innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

123 #1

Closed
innov wants to merge 8 commits from stable/0.90.x into stable/0.91.x
pull from: stable/0.90.x
merge into: innov:stable/0.91.x
Conversation 0 Commits 8 Files Changed 6 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb97c80010 - Show all commits

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