query_reviewer 0.1.3 → 0.1.4

data/lib/query_reviewer/mysql_adapter_extensions.rb

@@ -39,7 +39,7 @@ module QueryReviewer
     
     def select_with_review(sql, *args)
       sql.gsub!(/^SELECT /i, "SELECT SQL_NO_CACHE ") if QueryReviewer::CONFIGURATION["disable_sql_cache"]
-      @logger.silence { execute("SET PROFILING=1") } if QueryReviewer::CONFIGURATION["profiling"]
+      QueryReviewer.safe_log { execute("SET PROFILING=1") } if QueryReviewer::CONFIGURATION["profiling"]
       t1 = Time.now
       query_results = select_without_review(sql, *args)
       t2 = Time.now
@@ -50,19 +50,19 @@ module QueryReviewer
 
         if use_profiling
           t5 = Time.now
-          @logger.silence { execute("SET PROFILING=1") }
+          QueryReviewer.safe_log { execute("SET PROFILING=1") }
           t3 = Time.now
           select_without_review(sql, *args)
           t4 = Time.now
-          profile = @logger.silence { select_without_review("SHOW PROFILE ALL", *args) }
-          @logger.silence { execute("SET PROFILING=0") }
+          profile = QueryReviewer.safe_log { select_without_review("SHOW PROFILE ALL", *args) }
+          QueryReviewer.safe_log { execute("SET PROFILING=0") }
           t6 = Time.now
           Thread.current["queries"].overhead_time += t6 - t5
         else
           profile = nil
         end
 
-        cols = @logger.silence do
+        cols = QueryReviewer.safe_log do
           select_without_review("explain #{sql}", *args)
         end
 

data/lib/query_reviewer/rails.rb

@@ -33,5 +33,5 @@ if defined?(Rails::Railtie)
 else # Rails 2
   QueryReviewer.load_configuration
 
-  QueryReviewer.inject_reviewer
+  QueryReviewer.inject_reviewer if QueryReviewer.enabled?
 end

data/lib/query_reviewer/sql_query.rb

@@ -116,6 +116,7 @@ module QueryReviewer
 
     def self.sanitize_strings_and_numbers_from_sql(sql)
       new_sql = sql.clone
+      new_sql = new_sql.to_sql if new_sql.respond_to?(:to_sql)
       new_sql.gsub!(/\b\d+\b/, "N")
       new_sql.gsub!(/\b0x[0-9A-Fa-f]+\b/, "N")
       new_sql.gsub!(/''/, "'S'")

data/lib/query_reviewer/views/query_review_box_helper.rb

@@ -20,6 +20,7 @@ module QueryReviewer
       end
 
       def syntax_highlighted_sql(sql)
+        sql = sql.to_sql if sql.respond_to?(:to_sql)
         if QueryReviewer::CONFIGURATION["uv"]
           uv_out = Uv.parse(sql, "xhtml", "sql_rails", false, "blackboard")
           uv_out.gsub("<pre class=\"blackboard\">", "<code class=\"sql\">").gsub("</pre>", "</code>")

data/lib/query_reviewer.rb

@@ -49,6 +49,15 @@ module QueryReviewer
   def self.enabled?
     CONFIGURATION["enabled"]
   end
+  
+  def self.safe_log(&block)
+    if Rails::VERSION::STRING.to_f >= 3.1
+      @logger.quietly { yield }
+    else
+      @logger.silence { yield }
+    end
+  end
+  
 end
 
 # Rails Integration

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: query_reviewer
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - dsboulder, nesquena
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 -07:00
+date: 2012-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: []