Ticket #16811: 16811.patch

django/db/__init__.py

@@ -39 +39 @@
 def reset_queries(**kwargs):
     for conn in connections.all():
         conn.queries = []
-signals.request_started.connect(reset_queries)
+if settings.DEBUG:
+    signals.request_started.connect(reset_queries)
 
 # Register an event that rolls back the connections
 # when a Django request has an exception.

django/test/testcases.py

@@ -220 +220 @@
         self.old_debug_cursor = self.connection.use_debug_cursor
         self.connection.use_debug_cursor = True
         self.starting_queries = len(self.connection.queries)
-        request_started.disconnect(reset_queries)
+        if settings.DEBUG:
+            request_started.disconnect(reset_queries)
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         self.connection.use_debug_cursor = self.old_debug_cursor
-        request_started.connect(reset_queries)
+        if settings.DEBUG:
+            request_started.connect(reset_queries)
         if exc_type is not None:
             return