Ticket #5236: 5236.diff

django/db/backends/util.py

@@ -1 +1 @@
 import datetime
 import md5
+import traceback
 from time import time
 from django.utils.encoding import smart_unicode, force_unicode
 
@@ -18 +19 @@
         try:
             return self.cursor.execute(sql, params)
         finally:
-            stop = time()
-            self.db.queries.append({
-                'sql': smart_unicode(sql) % convert_args(params),
-                'time': "%.3f" % (stop - start),
-            })
+            self.trace_entry(smart_unicode(sql) % convert_args(params), start)
 
     def executemany(self, sql, param_list):
         start = time()
         try:
             return self.cursor.executemany(sql, param_list)
         finally:
-            stop = time()
-            self.db.queries.append({
-                'sql': 'MANY: ' + sql + ' ' + smart_unicode(tuple(param_list)),
-                'time': "%.3f" % (stop - start),
-            })
+            self.trace_entry('MANY: ' + sql + ' ' + smart_unicode(tuple(param_list)), start)
 
+    def trace_entry (self, sql, start):
+        stop = time()
+        entry = {
+            'sql': sql,
+            'time': "%.3f" % (stop - start),
+            # remove ourselves from the stack
+            'stack': traceback.format_stack()[:-2],
+        }
+        self.db.queries.append(entry)
+
     def __getattr__(self, attr):
         if attr in self.__dict__:
             return self.__dict__[attr]

docs/faq.txt

@@ -447 +447 @@
 this::
 
     >>> from django.db import connection
-    >>> connection.queries
-    [{'sql': 'SELECT polls_polls.id,polls_polls.question,polls_polls.pub_date FROM polls_polls',
-    'time': '0.002'}]
+    >>> len(connection.queries)
+    12
+    >>> connection.queries[0]['sql']
+    u'SELECT "polls_poll"."id","polls_poll"."question","polls_poll"."pub_date" FROM
+    "polls_poll"'
+    >>> connection.queries[0]['time']
+    '0.000'
+    >>> type(connection.queries[0]['stack'])
+    <type 'list'>
+    >>> connection.queries[0]['stack'][-1]
+    '  File "H:\\cygwin\\home\\Philippe\\django\\trunk\\django\\db\\models\\query.py", 
+    line 189, in iterator\ncursor.execute("SELECT " + (self._distinct and "DISTINCT " 
+    or "") + ",".join(select) + sql, params)\n'
+    >>> connection.queries[0]['stack'][0]
+    '  File "./manage.py", line 11, in <module>\n    execute_manager(settings)\n'
 
 ``connection.queries`` is only available if ``DEBUG`` is ``True``. It's a list
 of dictionaries in order of query execution. Each dictionary has the following::
 
     ``sql`` -- The raw SQL statement
-    ``time`` -- How long the statement took to execute, in seconds.
+    ``time`` -- How long the statement took to execute, in seconds
+    ``stack`` -- the stack, as a list of strings.
 
 ``connection.queries`` includes all SQL statements -- INSERTs, UPDATES,
 SELECTs, etc. Each time your app hits the database, the query will be recorded.