From 07407876a608a4d573dbd6ee4cee2d3798f752c5 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Tue, 7 Oct 2008 23:09:29 -0700
Subject: Fix inconsistent SQL timings.  All SQL timings are milliseconds now.

---
 debug_toolbar/panels/sql.py                           | 4 ++--
 debug_toolbar/templates/debug_toolbar/panels/sql.html | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'debug_toolbar')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 56b83a0..fc53247 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -27,7 +27,7 @@ class DatabaseStatTracker(util.CursorDebugWrapper):
             # We keep `sql` to maintain backwards compatibility
             self.db.queries.append({
                 'sql': self.db.ops.last_executed_query(self.cursor, sql, params),
-                'time': stop - start,
+                'time': (stop - start) * 1000, # convert to ms
                 'raw_sql': sql,
                 'params': _params,
                 'hash': sha_constructor(settings.SECRET_KEY + sql + _params).hexdigest(),
@@ -47,7 +47,7 @@ class SQLDebugPanel(DebugPanel):
         self._sql_time = 0
 
     def title(self):
-        self._sql_time = sum(map(lambda q: float(q['time']) * 1000, connection.queries))
+        self._sql_time = sum(map(lambda q: float(q['time']), connection.queries))
         return '%d SQL %s (%.2fms)' % (
             len(connection.queries), 
             (len(connection.queries) == 1) and 'query' or 'queries',
diff --git a/debug_toolbar/templates/debug_toolbar/panels/sql.html b/debug_toolbar/templates/debug_toolbar/panels/sql.html
index d35d83e..f6ff64f 100644
--- a/debug_toolbar/templates/debug_toolbar/panels/sql.html
+++ b/debug_toolbar/templates/debug_toolbar/panels/sql.html
@@ -10,12 +10,12 @@
 	<tbody>
 		{% for query in queries %}
 			<tr class="{% cycle 'odd' 'even' %}">
-				<td>{{ query.time|floatformat:"4" }}</td>
+				<td>{{ query.time|floatformat:"2" }}</td>
 				<td>
 				{% if query.params %}
-					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"4"|urlencode }}&hash={{ query.hash }}">SELECT</a>
-					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"4"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
-					<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"4"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
+					<a class="remoteCall" href="/__debug__/sql_select/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">SELECT</a>
+					<a class="remoteCall" href="/__debug__/sql_explain/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">EXPLAIN</a>
+					<a class="remoteCall" href="/__debug__/sql_profile/?sql={{ query.raw_sql|urlencode }}&params={{ query.params|urlencode }}&time={{ query.time|floatformat:"2"|urlencode }}&hash={{ query.hash }}">PROFILE</a>
 				{% endif %}
 				</td>
 				<td class="syntax">{{ query.sql|safe }}</td>
-- 
cgit v1.2.3