aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation/record_fetch_warning.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-01-04 15:15:55 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-01-04 15:15:55 -0700
commitc2181fbcb76d6db08b5231ba5ea8c51b80b97331 (patch)
treeb099fb952df120128d046dc12487f1319ef4b765 /activerecord/lib/active_record/relation/record_fetch_warning.rb
parent9fb4efedfc6409eaf59a8a55771eecacbb9f5c71 (diff)
parent0aa5150f9fb81fc6cf9d7b7915c8d7b015e452a2 (diff)
downloadrails-c2181fbcb76d6db08b5231ba5ea8c51b80b97331.tar.gz
rails-c2181fbcb76d6db08b5231ba5ea8c51b80b97331.tar.bz2
rails-c2181fbcb76d6db08b5231ba5ea8c51b80b97331.zip
Merge pull request #22550 from tamird/record-fetch-warning-allocate-less
activerecord: allocate fewer objects
Diffstat (limited to 'activerecord/lib/active_record/relation/record_fetch_warning.rb')
-rw-r--r--activerecord/lib/active_record/relation/record_fetch_warning.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/relation/record_fetch_warning.rb b/activerecord/lib/active_record/relation/record_fetch_warning.rb
index 0a1814b3dd..dbd08811fa 100644
--- a/activerecord/lib/active_record/relation/record_fetch_warning.rb
+++ b/activerecord/lib/active_record/relation/record_fetch_warning.rb
@@ -24,9 +24,7 @@ module ActiveRecord
end
# :stopdoc:
- ActiveSupport::Notifications.subscribe("sql.active_record") do |*args|
- payload = args.last
-
+ ActiveSupport::Notifications.subscribe("sql.active_record") do |*, payload|
QueryRegistry.queries << payload[:sql]
end
# :startdoc:
@@ -34,14 +32,14 @@ module ActiveRecord
class QueryRegistry # :nodoc:
extend ActiveSupport::PerThreadRegistry
- attr_accessor :queries
+ attr_reader :queries
def initialize
- reset
+ @queries = []
end
def reset
- @queries = []
+ @queries.clear
end
end
end