Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added eager loading support to Relation and ActiveRecord#all.

  • Loading branch information...
commit 65f055a3ed790d41aeca8d4ca7f3771b05cf544f 1 parent 3747f89
@miloops miloops authored
View
4 activerecord/lib/active_record/associations.rb
@@ -1455,9 +1455,9 @@ def add_touch_callbacks(reflection, touch_attribute)
after_destroy(method_name)
end
- def find_with_associations(options = {})
+ def find_with_associations(options = {}, join_dependency = nil)
catch :invalid_query do
- join_dependency = JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
+ join_dependency ||= JoinDependency.new(self, merge_includes(scope(:find, :include), options[:include]), options[:joins])
rows = select_all_rows(options, join_dependency)
return join_dependency.instantiate(rows)
end
View
17 activerecord/lib/active_record/base.rb
@@ -666,23 +666,18 @@ def last(*args)
def all(*args)
options = args.extract_options!
-
if options.empty? && !scoped?(:find)
relation = arel_table
else
+ relation = construct_finder_arel(options)
include_associations = merge_includes(scope(:find, :include), options[:include])
- # if include_associations.any? && references_eager_loaded_tables?(options)
- # join_dependency = JoinDependency.new(self, include_associations, options[:joins])
-
- # relation = construct_finder_arel_with_included_associations(options, join_dependency)
-
- # relation.preload(include_associations)
- # else
- relation = construct_finder_arel(options)
- if include_associations.any?
+ if include_associations.any?
+ if references_eager_loaded_tables?(options)
+ relation.eager_load(include_associations)
+ else
relation.preload(include_associations)
- # end
+ end
end
end
relation
View
32 activerecord/lib/active_record/relation.rb
@@ -7,11 +7,17 @@ def initialize(klass, relation)
@klass, @relation = klass, relation
@readonly = false
@associations_to_preload = []
+ @eager_load_associations = []
end
def preload(association)
- @associations_to_preload << association
- @associations_to_preload.flatten!
+ @associations_to_preload += association
+ self
+ end
+
+ def eager_load(association)
+ @eager_load_associations += association
+ self
end
def readonly
@@ -20,11 +26,23 @@ def readonly
end
def to_a
- records = @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
+ if @eager_load_associations.any?
+ records = catch :invalid_query do
+ @klass.send(:find_with_associations, {
+ :select => @relation.send(:select_clauses).join(', '),
+ :joins => @relation.joins(relation),
+ :group => @relation.send(:group_clauses).join(', '),
+ :order => @relation.send(:order_clauses).join(', '),
+ :conditions => @relation.send(:where_clauses).join("\n\tAND "),
+ :limit => @relation.taken
+ },
+ ActiveRecord::Associations::ClassMethods::JoinDependency.new(@klass, @eager_load_associations, nil))
+ end
+ else
+ records = @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
records
end
View
2  activerecord/test/cases/associations/cascaded_eager_loading_test.rb
@@ -104,7 +104,7 @@ def test_eager_association_loading_of_stis_with_multiple_references
authors.first.posts.first.special_comments.first.post.very_special_comment
end
end
-
+
def test_eager_association_loading_where_first_level_returns_nil
authors = Author.find(:all, :include => {:post_about_thinking => :comments}, :order => 'authors.id DESC')
assert_equal [authors(:mary), authors(:david)], authors
Please sign in to comment.
Something went wrong with that request. Please try again.