diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-02-26 16:11:25 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-02-26 16:11:25 +0000 |
| commit | 5670331343f7a31c7c9f4d15b8ccb09efb15a920 (patch) | |
| tree | 04f7300496e7550462c0433e386800df8f9b4f74 | |
| parent | 46cc7021a8ab60190d81e9d7e039cd84efbafb23 (diff) | |
| download | django-5670331343f7a31c7c9f4d15b8ccb09efb15a920.tar.gz | |
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
| -rw-r--r-- | django/db/backends/postgresql/base.py | 7 | ||||
| -rw-r--r-- | django/db/backends/postgresql_psycopg2/base.py | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index ec59dd6848..24a4422b12 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -116,9 +116,11 @@ class DatabaseWrapper(BaseDatabaseWrapper): self.validation = BaseDatabaseValidation(self) def _cursor(self): + new_connection = False set_tz = False settings_dict = self.settings_dict if self.connection is None: + new_connection = True set_tz = settings_dict.get('TIME_ZONE') if settings_dict['NAME'] == '': 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 connection_created.send(sender=self.__class__) cursor = self.connection.cursor() - if set_tz: - cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) + if new_connection: + if set_tz: + cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) if not hasattr(self, '_version'): self.__class__._version = get_version(cursor) if self._version[0:2] < (8, 0): diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py index 09b9eb4990..29b7e7ff1a 100644 --- a/django/db/backends/postgresql_psycopg2/base.py +++ b/django/db/backends/postgresql_psycopg2/base.py @@ -110,9 +110,11 @@ class DatabaseWrapper(BaseDatabaseWrapper): self.validation = BaseDatabaseValidation(self) def _cursor(self): + new_connection = False set_tz = False settings_dict = self.settings_dict if self.connection is None: + new_connection = True set_tz = settings_dict.get('TIME_ZONE') if settings_dict['NAME'] == '': from django.core.exceptions import ImproperlyConfigured @@ -137,8 +139,9 @@ class DatabaseWrapper(BaseDatabaseWrapper): connection_created.send(sender=self.__class__) cursor = self.connection.cursor() cursor.tzinfo_factory = None - if set_tz: - cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) + if new_connection: + if set_tz: + cursor.execute("SET TIME ZONE %s", [settings_dict['TIME_ZONE']]) if not hasattr(self, '_version'): self.__class__._version = get_version(cursor) if self._version[0:2] < (8, 0): |