active_record_query_trace 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3bf7027ae082e7dbcdebe76076e574cc666ebbe
-  data.tar.gz: c83658ea02bf13e42384917c5642dd60153bdbcc
+  metadata.gz: 3afa75c68dc6284f269661de1024006bc1f4990d
+  data.tar.gz: c550e68c1f3706b7b44dcf7cf5dcda439c846654
 SHA512:
-  metadata.gz: 026991c7074bf4bbaa9fa08db51d650d42ef8d2973e00e305dcd7e1332fef93336eaaf94c3626607e7f5c4caf98128b433df0c2c6ee1e664604d60879242e74c
-  data.tar.gz: 1447eff21be5a1a3230e7b56b5c9b9e03f663b2d3f4135d99bf3ee8124719026106415cc287830159e597a8cdcbfdb4f1c78207c6f5bae45e65d8cb2bf537270
+  metadata.gz: 57d3f9bfdafc5a31eabdef81cc9b10efec7f1f3031932ace1ba1c1526f99f5177fd35fbd7224f3e4a6c4738e608704e2edba743fa7899fc8193c84d27953d12e
+  data.tar.gz: 37244b76797af06f8f94cdbaf5425239ae9983fdbb3b7d51f860e52da67a04cea65d8b350094e2c046ce3a6f816ce1337dbe5955220e6dc8256989603fb924ec

data/HISTORY.md

@@ -1,3 +1,11 @@
+## 1.5 (2015-09-23)
+
+Merge pull request #13 from mtyeh411/fix_root_trace_filter
+
+Fixed Rails 4.2 backtrace_cleaner root filter with sql-logging gem
+
+Thank you @mtyeh411
+
 ## 1.4 (2015-03-05)
 
 Support for ignoring `ActiveRecord` cached queries that show up in the log with a `CACHE` prefix.

data/README.md

@@ -35,7 +35,7 @@ ActiveRecordQueryTrace.level = :app # default
 By default, a backtrace will be logged for every query, even cached queries that do not actually hit the database. You might find it useful not to print the backtrace for cached queries:
 
 ```ruby
-ActiveRecordQueryTrace.ignore_cached_queries
+ActiveRecordQueryTrace.ignore_cached_queries = true # Default is false.
 ```
 
 Additionally, if you are working with a large app, you may wish to limit the number of lines displayed for each query.

data/lib/active_record_query_trace.rb

@@ -18,6 +18,11 @@ module ActiveRecordQueryTrace
         ActiveRecordQueryTrace.level = :app
         ActiveRecordQueryTrace.lines = 5
         ActiveRecordQueryTrace.ignore_cached_queries = false
+
+        if ActiveRecordQueryTrace.level != :app
+          # Rails by default silences all backtraces that match Rails::BacktraceCleaner::APP_DIRS_PATTERN
+          Rails.backtrace_cleaner.remove_silencers!
+        end
       end
 
       def sql(event)
@@ -34,25 +39,31 @@ module ActiveRecordQueryTrace
           return if payload[:name] == 'SCHEMA'
           return if ActiveRecordQueryTrace.ignore_cached_queries && payload[:name] == 'CACHE'
 
-          debug(color("Called from: \n  ", MAGENTA, true) + clean_trace(caller)[index].join("\n  "))
+          cleaned_trace = clean_trace(caller)[index].join("\n  ")
+          debug(color("Called from: \n  ", MAGENTA, true) + cleaned_trace) unless cleaned_trace.blank?
         end
       end
 
       def clean_trace(trace)
+        # Rails relies on backtrace cleaner to set the application root directory filter
+        # the problem is that the backtrace cleaner is initialized before the application
+        # this ensures that the value of `root` used by the filter is set to the application root
+        if Rails.backtrace_cleaner.instance_variable_get(:@root) == '/'
+          Rails.backtrace_cleaner.instance_variable_set :@root, Rails.root.to_s
+        end
+
         case ActiveRecordQueryTrace.level
         when :full
           trace
-        when :rails
+        when :rails, :app
           Rails.respond_to?(:backtrace_cleaner) ? Rails.backtrace_cleaner.clean(trace) : trace
-        when :app
-          Rails.backtrace_cleaner.add_silencer { |line| not line =~ /^app/ }
-          Rails.backtrace_cleaner.clean(trace)
         else
           raise "Invalid ActiveRecordQueryTrace.level value '#{ActiveRecordQueryTrace.level}' - should be :full, :rails, or :app"
         end
       end
 
       attach_to :active_record
+
     end
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordQueryTrace
-  VERSION = '1.4'
+  VERSION = '1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_query_trace
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - Cody Caughlan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies: []
 description: Print stack trace of all queries to the Rails log. Helpful to find where
   queries are being executed in your application.
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- active_record_query_trace-1.4.gem
 - active_record_query_trace.gemspec
 - HISTORY.md
 - lib/active_record_query_trace.rb