kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Allow preload and eager_load to work on relations at the same time.

Browse source
This commit is contained in:
Emilio Tagua 2009-10-07 11:57:59 -03:00
parent c3b4da7796
commit 1d5854826b
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activerecord/lib/active_record/relation.rb
View file

@ -26,9 +26,9 @@ module ActiveRecord
end end
def to_a def to_a
if @eager_load_associations.any? records = if @eager_load_associations.any?
records = catch :invalid_query do catch :invalid_query do
@klass.send(:find_with_associations, { return @klass.send(:find_with_associations, {
:select => @relation.send(:select_clauses).join(', '), :select => @relation.send(:select_clauses).join(', '),
:joins => @relation.joins(relation), :joins => @relation.joins(relation),
:group => @relation.send(:group_clauses).join(', '), :group => @relation.send(:group_clauses).join(', '),
@ -38,12 +38,14 @@ module ActiveRecord
}, },
ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations, nil)) ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations, nil))
end end
[]
else else
records = @klass.find_by_sql(@relation.to_sql) @klass.find_by_sql(@relation.to_sql)
@klass.send(:preload_associations, records, @associations_to_preload) unless @associations_to_preload.empty?
records.each { |record| record.readonly! } if @readonly
end end
@klass.send(:preload_associations, records, @associations_to_preload) unless @associations_to_preload.empty?
records.each { |record| record.readonly! } if @readonly
records records
end end

22
activerecord/test/cases/relations_test.rb
View file

@ -4,6 +4,7 @@ require 'models/topic'
require 'models/comment' require 'models/comment'
require 'models/reply' require 'models/reply'
require 'models/author' require 'models/author'
require 'models/comment'
require 'models/entrant' require 'models/entrant'
require 'models/developer' require 'models/developer'
require 'models/company' require 'models/company'
@ -125,5 +126,26 @@ class RelationTest < ActiveRecord::TestCase
assert_equal 'Jamis', DeveloperCalledJamis.create!.name assert_equal 'Jamis', DeveloperCalledJamis.create!.name
end end
def test_loading_with_one_association
posts = Post.all(:include => :comments).to_a
post = posts.find { |p| p.id == 1 }
assert_equal 2, post.comments.size
assert post.comments.include?(comments(:greetings))
post = Post.find(:first, :include => :comments, :conditions => "posts.title = 'Welcome to the weblog'")
assert_equal 2, post.comments.size
assert post.comments.include?(comments(:greetings))
posts = Post.all(:include => :last_comment).to_a
post = posts.find { |p| p.id == 1 }
assert_equal Post.find(1).last_comment, post.last_comment
end
def test_loading_with_one_association_with_non_preload
posts = Post.all(:include => :last_comment, :order => 'comments.id DESC').to_a
post = posts.find { |p| p.id == 1 }
assert_equal Post.find(1).last_comment, post.last_comment
end
end end