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

Corrected an edge case introduced in r12602. Thanks to Ramiro Morales for the eagle eyes. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-02-26 16:11:25 +00:00
parent 46cc7021a8
commit 5670331343
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/db/backends/postgresql/base.py
View File

@ -116,9 +116,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
self.validation = BaseDatabaseValidation(self) self.validation = BaseDatabaseValidation(self)
def _cursor(self): def _cursor(self):
new_connection = False
set_tz = False set_tz = False
settings_dict = self.settings_dict settings_dict = self.settings_dict
if self.connection is None: if self.connection is None:
new_connection = True
set_tz = settings_dict.get('TIME_ZONE') set_tz = settings_dict.get('TIME_ZONE')
if settings_dict['NAME'] == '': if settings_dict['NAME'] == '':
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -136,8 +138,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
self.connection.set_isolation_level(1) # make transactions transparent to all cursors self.connection.set_isolation_level(1) # make transactions transparent to all cursors
connection_created.send(sender=self.__class__) connection_created.send(sender=self.__class__)
cursor = self.connection.cursor() cursor = self.connection.cursor()
if set_tz: if new_connection:
cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) if set_tz:
cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']])
if not hasattr(self, '_version'): if not hasattr(self, '_version'):
self.__class__._version = get_version(cursor) self.__class__._version = get_version(cursor)
if self._version[0:2] < (8, 0): if self._version[0:2] < (8, 0):

7
django/db/backends/postgresql_psycopg2/base.py
View File

@ -110,9 +110,11 @@ class DatabaseWrapper(BaseDatabaseWrapper):
self.validation = BaseDatabaseValidation(self) self.validation = BaseDatabaseValidation(self)
def _cursor(self): def _cursor(self):
new_connection = False
set_tz = False set_tz = False
settings_dict = self.settings_dict settings_dict = self.settings_dict
if self.connection is None: if self.connection is None:
new_connection = True
set_tz = settings_dict.get('TIME_ZONE') set_tz = settings_dict.get('TIME_ZONE')
if settings_dict['NAME'] == '': if settings_dict['NAME'] == '':
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
@ -137,8 +139,9 @@ class DatabaseWrapper(BaseDatabaseWrapper):
connection_created.send(sender=self.__class__) connection_created.send(sender=self.__class__)
cursor = self.connection.cursor() cursor = self.connection.cursor()
cursor.tzinfo_factory = None cursor.tzinfo_factory = None
if set_tz: if new_connection:
cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) if set_tz:
cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']])
if not hasattr(self, '_version'): if not hasattr(self, '_version'):
self.__class__._version = get_version(cursor) self.__class__._version = get_version(cursor)
if self._version[0:2] < (8, 0): if self._version[0:2] < (8, 0):