Ticket #9640: preloading.6.patch

activerecord/test/associations/join_model_test.rb

@@ -317 +317 @@
-      assert_equal posts(:welcome, :thinking), tags(:general).taggables
-    end
-    assert_raises ActiveRecord::EagerLoadPolymorphicError do
-
-
+, :conditions => 'bogus_table.column = 1'
+    
-  end
-  
-  def test_has_many_polymorphic_with_source_type
@@ -331 +331 @@
-    assert_no_queries do
-      assert_equal desired, tag_with_include.tagged_posts
-    end
+    assert_equal 4, tag_with_include.taggings.length
-  end
-
-  def test_has_many_through_has_many_find_all
@@ -540 +541 @@
-    assert_equal [comments(:does_it_hurt)], authors(:david).special_post_comments
-  end
-
+  def test_polymorphic_has_many
+    expected = taggings(:welcome_general)
+    p = Post.find(posts(:welcome).id, :include => :taggings)
+    assert_no_queries {assert p.taggings.include?(expected)}
+    assert posts(:welcome).taggings.include?(taggings(:welcome_general))
+  end
+
+  def test_polymorphic_has_one
+    expected = posts(:welcome)
+    
+    tagging  = Tagging.find(taggings(:welcome_general).id, :include => :taggable)
+    assert_no_queries { assert_equal expected, tagging.taggable}
+  end
+
+  def test_polymorphic_belongs_to
+    p = Post.find(posts(:welcome).id, :include => {:taggings => :taggable})
+    assert_no_queries {assert_equal posts(:welcome), p.taggings.first.taggable}
+  end
+
+  def test_preload_polymorphic_has_many_through
+    posts           = Post.find(:all, :order => 'posts.id')
+    posts_with_tags = Post.find(:all, :include => :tags, :order => 'posts.id')
+    assert_equal posts.length, posts_with_tags.length
+    posts.length.times do |i|
+      assert_equal posts[i].tags.length, assert_no_queries { posts_with_tags[i].tags.length }
+    end
+  end
+   
+  def test_preload_polymorph_many_types
+    taggings = Tagging.find :all, :include => :taggable, :conditions => ['taggable_type != ?', 'FakeModel']
+    assert_no_queries do
+      taggings.first.taggable.id
+      taggings[1].taggable.id
+    end
+    assert_equal items(:dvd), taggings.last.taggable
+    assert_equal posts(:welcome), taggings.first.taggable
+  end
+
+  def test_preload_polymorphic_has_many
+    posts               = Post.find(:all, :order => 'posts.id')
+    posts_with_taggings = Post.find(:all, :include => :taggings, :order => 'posts.id')
+    assert_equal posts.length, posts_with_taggings.length
+    posts.length.times do |i|
+      assert_equal posts[i].taggings.length, assert_no_queries { posts_with_taggings[i].taggings.length }
+    end
+  end
+  
+  def test_belongs_to_shared_parent
+    comments = Comment.find(:all, :include => :post, :conditions => 'post_id = 1')
+    assert_no_queries do
+      assert_equal comments.first.post, comments[1].post
+    end
+  end
+  
-  private
-    # create dynamic Post models to allow different dependency options
-    def find_post_with_dependency(post_id, association, association_name, dependency)

activerecord/test/associations/eager_test.rb

@@ -56 +56 @@
-    assert posts.first.comments.include?(comments(:greetings))
-  end
-
+  def test_duplicate_middle_objects
+    comments = Comment.find :all, :conditions => 'post_id = 1', :include => [:post => :author]
+    assert_no_queries do
+      comments.each {|comment| comment.post.author.name}
+    end
+  end
+
-  def test_loading_from_an_association
-    posts = authors(:david).posts.find(:all, :include => :comments, :order => "posts.id")
-    assert_equal 2, posts.first.comments.size
@@ -348 +355 @@
-    assert_equal posts(:sti_post_and_comments, :sti_comments), Post.find(:all, :include => [:author, :comments], :conditions => "authors.name = 'David'", :order => 'UPPER(posts.title) DESC, posts.id', :limit => 2, :offset => 1)
-  end
-
+  def test_preload_with_interpolation
+    assert_equal [comments(:greetings)], Post.find(posts(:welcome).id, :include => :comments_with_interpolated_conditions).comments_with_interpolated_conditions
+  end
+  
-  def test_eager_with_multiple_associations_with_same_table_has_many_and_habtm
-    # Eager includes of has many and habtm associations aren't necessarily sorted in the same way
-    def assert_equal_after_sort(item1, item2, item3 = nil)
@@ -400 +411 @@
-
-  def test_preconfigured_includes_with_belongs_to
-    author = posts(:welcome).author_with_posts
-equal 5, author.posts.size
+no_queries {assert_equal 5, author.posts.size}
-  end
-
-  def test_preconfigured_includes_with_has_one
-    comment = posts(:sti_comments).very_special_comment_with_post
-equal posts(:sti_comments), comment.post
+no_queries {assert_equal posts(:sti_comments), comment.post}
-  end
-
-  def test_preconfigured_includes_with_has_many
-    posts = authors(:david).posts_with_comments
-    one = posts.detect { |p| p.id == 1 }
-
-
+
+
+
+
-  end
-
-  def test_preconfigured_includes_with_habtm
-    posts = authors(:david).posts_with_categories
-    one = posts.detect { |p| p.id == 1 }
-
-
+
+
+
+
-  end
-
-  def test_preconfigured_includes_with_has_many_and_habtm
-    posts = authors(:david).posts_with_comments_and_categories
-    one = posts.detect { |p| p.id == 1 }
-
-
-
+
+
+
+
+
-  end
-  
-  def test_count_with_include

activerecord/test/fixtures/post.rb

@@ -12 +12 @@
-      find(:first, :order => "id DESC")
-    end
-  end
+  
+  has_many :comments_with_interpolated_conditions, :class_name => 'Comment',
+      :conditions => ['#{"#{aliased_table_name}." rescue ""}body = ?', 'Thank you for the welcome']
-
-  has_one  :very_special_comment
-  has_one  :very_special_comment_with_post, :class_name => "VerySpecialComment", :include => :post
@@ -42 +45 @@
-  has_many :readers
-  has_many :people, :through => :readers
-
+
+  
-  def self.what_are_you
-    'a post...'
-  end

activerecord/lib/active_record/association_preload.rb

@@ +1 @@
+module ActiveRecord
+  module AssociationPreload #:nodoc:
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    
+    module ClassMethods                                                                                                
+      
+      # Loads the named associations for the activerecord record (or records) given
+      # preload_options is passed only one level deep: don't pass to the child associations when associations is a Hash
+      protected
+      def preload_associations(records, associations, preload_options={})
+        records = [records].flatten.compact
+        return if records.empty?
+        case associations
+        when Array then associations.each {|association| preload_associations(records, association, preload_options)}
+        when Symbol, String then preload_one_association(records, associations.to_sym, preload_options)
+        when Hash then
+          associations.each do |parent, child|
+            raise "parent must be an association name" unless parent.is_a?(String) || parent.is_a?(Symbol)
+            preload_associations(records, parent, preload_options)
+            reflection = reflections[parent]
+            parents = records.map {|record| record.send(reflection.name)}.flatten
+            unless parents.empty?
+              parents.first.class.preload_associations(parents, child)
+            end
+          end
+        end  
+      end    
+    
+      private
+    
+      def preload_one_association(records, association, preload_options={}) 
+        reflection = reflections[association]
+        raise ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?" unless reflection
+        
+        send(:"preload_#{reflection.macro}_association", records, reflection, preload_options)
+      end
+    
+      def add_preloaded_records_to_collection(parent_records, reflection_name, associated_record)
+        parent_records.each do |parent_record|
+          association_proxy = parent_record.send(reflection_name)
+          association_proxy.loaded
+          association_proxy.target.push(*[associated_record].flatten)
+        end
+      end
+      
+      def set_association_collection_records(id_to_record_map, reflection_name, associated_records, key)
+        associated_records.each do |associated_record|
+          mapped_records = id_to_record_map[associated_record[key].to_i]
+          add_preloaded_records_to_collection(mapped_records, reflection_name, associated_record)
+        end
+      end
+      
+      def set_association_single_records(id_to_record_map, reflection_name, associated_records, key)
+        associated_records.each do |associated_record|
+          mapped_records = id_to_record_map[associated_record[key].to_i]
+          mapped_records.each do |mapped_record|
+            mapped_record.send("set_#{reflection_name}_target", associated_record)
+          end
+        end
+      end
+
+      def construct_id_map(records)
+        id_to_record_map = {}
+        ids = []
+        records.each do |record|
+          ids << record.id
+          mapped_records = (id_to_record_map[record.id] ||= [])
+          mapped_records << record
+        end
+        ids.uniq!
+        return id_to_record_map, ids
+      end
+              
+      def preload_has_and_belongs_to_many_association(records, reflection, preload_options={})
+        table_name = reflection.klass.table_name
+        id_to_record_map, ids = construct_id_map(records)
+        records.each {|record| record.send(reflection.name).loaded}
+        options = reflection.options
+
+        conditions = "t0.#{reflection.primary_key_name}  IN (?)"
+        conditions << append_conditions(options, preload_options)
+        
+        associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
+        :include => options[:include],
+        :joins => "INNER JOIN #{options[:join_table]} as t0 ON #{reflection.klass.table_name}.#{reflection.klass.primary_key} = t0.#{reflection.association_foreign_key}",
+        :select => "#{options[:select] || table_name+'.*'}, t0.#{reflection.primary_key_name} as _parent_record_id",
+        :order => options[:order])
+
+        set_association_collection_records(id_to_record_map, reflection.name, associated_records, '_parent_record_id')
+      end
+
+      def foreign_key_for_preload reflection
+        options = reflection.options
+        if options[:as]
+          foreign_key = "#{options[:as]}_id"
+        else
+          foreign_key = options[:foreign_key] || reflection.active_record.to_s.foreign_key  
+        end          
+      end
+
+      def preload_has_one_association(records, reflection, preload_options={})
+        id_to_record_map, ids = construct_id_map(records)
+        records.each {|record| record.send("set_#{reflection.name}_target", nil)}
+        
+        set_association_single_records(id_to_record_map, reflection.name, find_associated_records(ids, reflection, preload_options),
+                                       foreign_key_for_preload(reflection))
+      end
+
+      def preload_has_many_association(records, reflection, preload_options={})
+        id_to_record_map, ids = construct_id_map(records)
+        records.each {|record| record.send(reflection.name).loaded}
+        options = reflection.options
+
+        if options[:through]
+          through_records = preload_through_records(records, reflection, options[:through])
+          through_reflection = reflections[options[:through]]              
+          through_primary_key = through_reflection.primary_key_name
+          unless through_records.empty?
+            source = reflection.source_reflection.name
+            through_records.first.class.preload_associations(through_records, source)
+            through_records.compact.each do |through_record|
+              add_preloaded_records_to_collection(id_to_record_map[through_record[through_primary_key].to_i], 
+                                                 reflection.name, through_record.send(source))
+            end
+          end
+        else
+          set_association_collection_records(id_to_record_map, reflection.name, find_associated_records(ids, reflection, preload_options),
+                                             foreign_key_for_preload(reflection))
+        end
+      end
+
+      def preload_through_records(records, reflection, through_association)
+        through_reflection = reflections[through_association]              
+        through_primary_key = through_reflection.primary_key_name
+        
+        if reflection.options[:source_type]
+          interface = reflection.source_reflection.options[:foreign_type]
+          preload_options = {:conditions => ["#{interface} = ?", reflection.options[:source_type]]}
+
+          records.first.class.preload_associations(records, through_association, preload_options)
+                            
+          # Dont cache the association - we would only be caching a subset
+          through_records = []
+          records.compact.each do |record|
+            proxy = record.send(through_association)
+            through_records << proxy.target
+            proxy.reset
+          end
+          through_records = through_records.flatten
+        else
+          records.first.class.preload_associations(records, through_association)
+          through_records = records.compact.map {|record| record.send(through_association)}.flatten
+        end
+      end
+
+      def preload_belongs_to_association(records, reflection, preload_options={})
+        options = reflection.options
+        primary_key_name = reflection.primary_key_name
+
+        if options[:polymorphic]
+          polymorph_type = options[:foreign_type]
+          klasses_and_ids = {}
+
+          # Construct a mapping from klass to a list of ids to load and a mapping of those ids back to their parent_records
+          records.each do |record|
+            klass = record.send(polymorph_type)
+            klass_id = record.send(primary_key_name)
+    
+            id_map = klasses_and_ids[klass] ||= {}
+            id_list_for_klass_id = (id_map[klass_id] ||= [])
+            id_list_for_klass_id << record
+          end
+          klasses_and_ids = klasses_and_ids.to_a
+        else
+          id_map = {}
+          records.each do |record|
+            mapped_records = (id_map[record.send(primary_key_name)] ||= [])
+            mapped_records << record
+          end
+          klasses_and_ids = [[reflection.klass.name, id_map]]
+        end
+
+        klasses_and_ids.each do |klass_and_id|
+          klass_name, id_map = *klass_and_id
+          klass = klass_name.constantize
+  
+          table_name = klass.table_name
+          conditions = "#{table_name}.#{primary_key} IN (?)"
+          conditions << append_conditions(options, preload_options)
+          associated_records = klass.find(:all, :conditions => [conditions, id_map.keys.uniq],
+                                          :include => options[:include],
+                                          :select => options[:select],
+                                          :joins => options[:joins],
+                                          :order => options[:order])
+          set_association_single_records(id_map, reflection.name, associated_records, 'id')
+        end
+      end 
+      
+      def find_associated_records(ids, reflection, preload_options)
+        options = reflection.options        
+        table_name = reflection.klass.table_name
+                
+        if interface = reflection.options[:as]
+          conditions = "#{reflection.klass.table_name}.#{interface}_id IN (?) and #{reflection.klass.table_name}.#{interface}_type = '#{self.name}'"
+        else
+          foreign_key = options[:foreign_key] || reflection.active_record.to_s.foreign_key
+          conditions = "#{reflection.klass.table_name}.#{foreign_key} IN (?)"
+        end
+        
+        conditions << append_conditions(options, preload_options)
+        
+        reflection.klass.find(:all, 
+                              :select => (options[:select] || "#{table_name}.*"),
+                              :include => options[:include],
+                              :conditions => [conditions, ids],
+                              :joins => options[:joins],
+                              :group => options[:group],
+                              :order => options[:order])
+      end
+      
+      
+      def interpolate_sql_for_preload(sql)
+        instance_eval("%@#{sql.gsub('@', '\@')}@") 
+      end
+      
+      def append_conditions(options, preload_options)
+        sql = ""
+        sql << " AND (#{interpolate_sql_for_preload(sanitize_sql(options[:conditions]))})" if options[:conditions]
+        sql << " AND (#{sanitize_sql preload_options[:conditions]})" if preload_options[:conditions]
+        sql
+      end
+      
+    end
+  end
+end

activerecord/lib/active_record/associations.rb

@@ -1333 +1333 @@
-            order_table_name != table_name
-          end
-        end
+        
+        def references_eager_loaded_tables?(options)
+          include_eager_order?(options) || include_eager_conditions?(options)
+        end
-
-        def using_limitable_reflections?(reflections)
-          reflections.reject { |r| [ :belongs_to, :has_one ].include?(r.macro) }.length.zero?

activerecord/lib/active_record/base.rb

@@ -1155 +1155 @@
-        end
-
-        def find_every(options)
-
-
-
-
+
+
+
+
+
+
+
+
-          records.each { |record| record.readonly! } if options[:readonly]
-
-          records

activerecord/lib/active_record.rb

@@ -43 +43 @@
-require 'active_record/callbacks'
-require 'active_record/reflection'
-require 'active_record/associations'
+require 'active_record/association_preload'
-require 'active_record/aggregations'
-require 'active_record/transactions'
-require 'active_record/timestamp'
@@ -63 +64 @@
-  include ActiveRecord::Observing
-  include ActiveRecord::Timestamp
-  include ActiveRecord::Associations
+  include ActiveRecord::AssociationPreload
-  include ActiveRecord::Aggregations
-  include ActiveRecord::Transactions
-  include ActiveRecord::Reflection