Ticket #17882: 17882-second-take.patch

django/test/signals.py

@@ -1 +1 @@
 from django.conf import settings
-from django.db import close_connection
+from django.db import connections
 from django.dispatch import Signal
 
 template_rendered = Signal(providing_args=["template", "context"])
 
 setting_changed = Signal(providing_args=["setting", "value"])
 
-# Close the database connection to re-establish it with the proper time zone.
-def close_connection_on_time_zone_change(**kwargs):
-    if (kwargs['setting'] == 'USE_TZ'
-        or (kwargs['setting'] == 'TIME_ZONE' and not settings.USE_TZ)):
-        close_connection()
-setting_changed.connect(close_connection_on_time_zone_change)
+def update_connections_time_zone(**kwargs):
+    if kwargs['setting'] == 'USE_TZ' and settings.TIME_ZONE != 'UTC':
+        USE_TZ, TIME_ZONE = kwargs['value'], settings.TIME_ZONE
+    elif kwargs['setting'] == 'TIME_ZONE' and not settings.USE_TZ:
+        USE_TZ, TIME_ZONE = settings.USE_TZ, kwargs['value']
+    else:   # no need to change the database connnections' time zones
+        return
+    tz = 'UTC' if USE_TZ else TIME_ZONE
+    for conn in connections.all():
+        tz_sql = conn.ops.set_time_zone_sql()
+        if tz_sql:
+            conn.cursor().execute(tz_sql, [tz])
+setting_changed.connect(update_connections_time_zone)

django/db/backends/oracle/base.py

@@ -274 +274 @@
     def savepoint_rollback_sql(self, sid):
         return convert_unicode("ROLLBACK TO SAVEPOINT " + self.quote_name(sid))
 
+    def set_time_zone_sql(self):
+        return "ALTER SESSION SET TIME_ZONE = %s"
+
     def sql_flush(self, style, tables, sequences):
         # Return a list of 'TRUNCATE x;', 'TRUNCATE y;',
         # 'TRUNCATE z;'... style SQL statements

django/db/backends/__init__.py

@@ -710 +710 @@
         """
         raise NotImplementedError
 
+    def set_time_zone_sql(self):
+        """
+        Returns the SQL that will set the connection's time zone.
+
+        Returns '' if the backend doesn't support time zones.
+        """
+        return ''
+
     def sql_flush(self, style, tables, sequences):
         """
         Returns a list of SQL statements required to remove all data from

django/db/backends/postgresql_psycopg2/base.py

@@ -190 +190 @@
                     # Set the time zone in autocommit mode (see #17062)
                     self.connection.set_isolation_level(
                             psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT)
-                    self.connection.cursor().execute("SET TIME ZONE %s", [tz])
+                    self.connection.cursor().execute(
+                            self.ops.set_time_zone_sql(), [tz])
             self.connection.set_isolation_level(self.isolation_level)
             self._get_pg_version()
             connection_created.send(sender=self.__class__, connection=self)

django/db/backends/postgresql_psycopg2/operations.py

@@ -71 +71 @@
             return name # Quoting once is enough.
         return '"%s"' % name
 
+    def set_time_zone_sql(self):
+        return "SET TIME ZONE %s"
+
     def sql_flush(self, style, tables, sequences):
         if tables:
             # Perform a single SQL 'TRUNCATE x, y, z...;' statement.  It allows