From 86b7d54760fa1e682552d8aa2c9570c1848c5431 Mon Sep 17 00:00:00 2001
From: Rob Hudson
Date: Fri, 11 Sep 2009 18:29:02 -0700
Subject: Added more SQL keywords.

---
 debug_toolbar/panels/sql.py | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'debug_toolbar')

diff --git a/debug_toolbar/panels/sql.py b/debug_toolbar/panels/sql.py
index 244905b..17f4598 100644
--- a/debug_toolbar/panels/sql.py
+++ b/debug_toolbar/panels/sql.py
@@ -20,15 +20,45 @@ socketserver_path = os.path.realpath(os.path.dirname(SocketServer.__file__))
 # get a copy of the toolbar object with access to its config dictionary
 SQL_WARNING_THRESHOLD = getattr(settings, 'DEBUG_TOOLBAR_CONFIG', {}).get('SQL_WARNING_THRESHOLD', 500)
 
+# Note: This isn't intended to catch ALL possible SQL keywords, just a good common set.
+# Note: Subsets are listed last to avoid matching a subset of a keyword.  This
+# whole thing could be greatly improved but for now this works.
 SQL_KEYWORDS = (
-    'SELECT',
+    'ALTER',
+    'AND',
+    'ASC',
+    'AS',
+    'AVG',
+    'COUNT',
+    'CREATE',
+    'DESC',
+    'DELETE',
+    'DISTINCT',
+    'DROP',
     'FROM',
-    'WHERE',
+    'GROUP BY',
+    'HAVING',
     'INNER JOIN',
+    'INSERT',
+    'IN',
     'LEFT OUTER JOIN',
+    'LIKE',
+    'LIMIT',
+    'MAX',
+    'MIN',
+    'OFFSET',
+    'ON',
     'ORDER BY',
-    'HAVING',
-    'GROUP BY',
+    'OR',
+    'SELECT',
+    'SET',
+    'STDDEV_POP',
+    'STDDEV_SAMP',
+    'SUM',
+    'UPDATE',
+    'VAR_POP',
+    'VAR_SAMP',
+    'WHERE',
 )
 
 def tidy_stacktrace(strace):
-- 
cgit v1.2.3