From 5eb0ddbc4e2a7a00e6ffb1340581bf00f1cf0230 Mon Sep 17 00:00:00 2001
From: mvantellingen <michaelvantellingen@gmail.com>
Date: Sun, 13 Feb 2011 21:20:00 +0100
Subject: [PATCH] Use the util.format_fname function to format the context
 location

---
 flaskext/debugtoolbar/panels/sqlalchemy.py          | 13 ++++++++++---
 .../debugtoolbar/templates/panels/sqlalchemy.html   |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/flaskext/debugtoolbar/panels/sqlalchemy.py b/flaskext/debugtoolbar/panels/sqlalchemy.py
index 70e8abc..ae53617 100644
--- a/flaskext/debugtoolbar/panels/sqlalchemy.py
+++ b/flaskext/debugtoolbar/panels/sqlalchemy.py
@@ -13,6 +13,8 @@ except ImportError:
     HAVE_PYGMENTS = False
 
 from flaskext.debugtoolbar.panels import DebugPanel
+from flaskext.debugtoolbar.utils import format_fname
+
 _ = lambda x: x
 
 class SQLAlchemyDebugPanel(DebugPanel):
@@ -51,10 +53,15 @@ class SQLAlchemyDebugPanel(DebugPanel):
 
     def content(self):
         queries = get_debug_queries()
+        data = []
         for query in queries:
-            query.sql = self._format_sql(query.statement, query.parameters)
-
-        return self.render('panels/sqlalchemy.html', { 'queries': queries})
+            data.append({
+                'duration': query.duration,
+                'sql': self._format_sql(query.statement, query.parameters),
+                'context_long': query.context,
+                'context': format_fname(query.context)
+            })
+        return self.render('panels/sqlalchemy.html', { 'queries': data})
 
 
     def _format_sql(self, query, args):
diff --git a/flaskext/debugtoolbar/templates/panels/sqlalchemy.html b/flaskext/debugtoolbar/templates/panels/sqlalchemy.html
index 0bf29d3..49df5e8 100644
--- a/flaskext/debugtoolbar/templates/panels/sqlalchemy.html
+++ b/flaskext/debugtoolbar/templates/panels/sqlalchemy.html
@@ -10,7 +10,7 @@
 	<tbody>
 		{% for query in queries %}
 			<tr class="{{ loop.cycle('flDebugOdd' 'flDebugEven') }}">
-				<td>{{ query.duration }}</td>
+				<td>{{ '%.4f'|format(query.duration) }}</td>
 				<td>
                     {#
 				{% if query.params %}
@@ -24,7 +24,7 @@
 				{% endif %}
                     #}
 				</td>
-				<td>
+				<td title="{{ query.context_long }}">
                     {{ query.context }}
 				</td>
 				<td class="syntax">