Added association preload to relation.

2 files changed, 28 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 402d68c36e..1c12189e15 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -664,11 +664,28 @@ module ActiveRecord #:nodoc:
       # This is an alias for find(:all).  You can pass in all the same arguments to this method as you can
       # to find(:all)
       def all(*args)
-        if args.empty? && !scoped?(:find)
-          arel_table
+        options = args.extract_options!
+
+
+        if options.empty? #&& !scoped?(:find)
+          relation = arel_table
         else
-          construct_finder_arel(*args)
+          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?
+              relation.preload(include_associations)
+            # end
+          end
         end
+        relation
       end
 
       # Executes a custom SQL query against your database and returns all the results.  The results will
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 4b53857d36..6abb2df8ff 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -6,6 +6,12 @@ module ActiveRecord
     def initialize(klass, relation)
       @klass, @relation = klass, relation
       @readonly = false
+      @associations_to_preload = []
+    end
+
+    def preload(association)
+      @associations_to_preload << association
+      @associations_to_preload.flatten!
     end
 
     def readonly
@@ -16,6 +22,8 @@ module ActiveRecord
     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
 
       records