Sanitize GROUP BY etc. as well

methodmissing · Mar 15, 2009 · 3845a2c · 3845a2c
1 parent 7490916
commit 3845a2c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.textile b/README.textile
@@ -214,7 +214,7 @@ h2. Todo
 
 * Deeper coverage for Scrooge::AttributesProxy ( pending conversion to a subclass of Hash instead )
 
-* Extract Scrooge::Callsite
+* Test cases for Scrooge::Callsite
 
 * Track both columns AND association invocations off Scrooge::Callsite
 

diff --git a/lib/optimizations/columns/macro.rb b/lib/optimizations/columns/macro.rb
@@ -28,7 +28,7 @@ module SingletonMethods
 
         ScroogeBlankString = "".freeze
         ScroogeComma = ",".freeze 
-        ScroogeRegexSanitize = /(?:LIMIT|WHERE).*/i
+        ScroogeRegexSanitize = /(?:LIMIT|WHERE|FROM|GROUP\s*BY|HAVING|ORDER\s*BY|PROCEDURE|FOR\s*UPDATE|INTO\s*OUTFILE).*/i
         ScroogeRegexJoin = /(?:left|inner|outer|cross)*\s*(?:straight_join|join)/i
 
         @@scrooge_select_regexes = {}