diff options
| author | Tim Graham <timograham@gmail.com> | 2016-02-06 09:21:05 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-02-08 07:41:56 -0500 |
| commit | 6b689a505c7a89d497e2e8af690fdf5a00780a2d (patch) | |
| tree | 3db8baf1b64c28d5e3264387a14e2493dd0499ec /django/db/backends | |
| parent | 530f0adcf3aab3b3eabdc37a5ea6e8943e8135c4 (diff) | |
[1.9.x] Fixed #26177 -- Fixed a PostgreSQL crash with TIME_ZONE=None and USE_TZ=False.
Backport of 97eb3356b2a7488c8d0ca0e47ef3e538852d44a2 from master
Diffstat (limited to 'django/db/backends')
| -rw-r--r-- | django/db/backends/postgresql/base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index 383601e477..6a53648f74 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -196,7 +196,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): conn_timezone_name = self.connection.get_parameter_status('TimeZone') - if conn_timezone_name != self.timezone_name: + if self.timezone_name and conn_timezone_name != self.timezone_name: cursor = self.connection.cursor() try: cursor.execute(self.ops.set_time_zone_sql(), [self.timezone_name]) |