Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8413 from senny/8403_backport
backport #8403, no intermediate AR objects when eager loading.
  • Loading branch information
rafaelfranca committed Dec 4, 2012
2 parents dac811e + 1b96176 commit 549da0d
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 2 deletions.
7 changes: 7 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,5 +1,12 @@
## Rails 3.2.10 (unreleased)

* Do not instantiate intermediate Active Record objects when eager loading.
These records caused `after_find` to run more than expected.
Fix #3313
Backport of #8403

*Yves Senn*

* Fix `pluck` to work with joins. Backport of #4942.

*Carlos Antonio da Silva*
Expand Down
6 changes: 4 additions & 2 deletions activerecord/lib/active_record/relation/finder_methods.rb
Expand Up @@ -253,9 +253,11 @@ def construct_limited_ids_condition(relation)
orders = relation.order_values.map { |val| val.presence }.compact
values = @klass.connection.distinct("#{@klass.connection.quote_table_name table_name}.#{primary_key}", orders)

relation = relation.dup
relation = relation.dup.select(values)

id_rows = @klass.connection.select_all(relation.arel, 'SQL', relation.bind_values)
ids_array = id_rows.map {|row| row[primary_key]}

ids_array = relation.select(values).collect {|row| row[primary_key]}
ids_array.empty? ? raise(ThrowResult) : table[primary_key].in(ids_array)
end

Expand Down
6 changes: 6 additions & 0 deletions activerecord/test/cases/associations/eager_test.rb
Expand Up @@ -916,6 +916,12 @@ def test_conditions_on_join_table_with_include_and_limit
assert_equal 3, Developer.find(:all, :include => 'projects', :conditions => 'developers_projects.access_level = 1', :limit => 5).size
end

def test_dont_create_temporary_active_record_instances
Developer.instance_count = 0
developers = Developer.find(:all, :include => 'projects', :conditions => 'developers_projects.access_level = 1', :limit => 5).to_a
assert_equal developers.count, Developer.instance_count
end

def test_order_on_join_table_with_include_and_limit
assert_equal 5, Developer.find(:all, :include => 'projects', :order => 'developers_projects.joined_on DESC', :limit => 5).size
end
Expand Down
9 changes: 9 additions & 0 deletions activerecord/test/models/developer.rb
Expand Up @@ -63,6 +63,15 @@ def self.all_johns
self.all
end
end

after_find :track_instance_count
cattr_accessor :instance_count

def track_instance_count
self.class.instance_count ||= 0
self.class.instance_count += 1
end
private :track_instance_count
end

class AuditLog < ActiveRecord::Base
Expand Down

0 comments on commit 549da0d

Please sign in to comment.