Ticket #9640: fix_nested_includes.patch

activerecord/test/schema/schema.rb

@@ -20 +20 @@
-      t.primary_key :auto_id
-      t.integer     :value
-    end
+    
+    create_table :avatars, :force => true do |t|
+      t.integer :picture_id, :null => false
+      t.string :filename
+      t.string :thumbnail
+    end
+    add_index :avatars, [:picture_id, :thumbnail], :unique => true
-
-    create_table :binaries, :force => true do |t|
-      t.binary :data
@@ -148 +155 @@
-      t.string  :first_name, :null => false
-      t.integer :lock_version, :null => false, :default => 0
-    end
+    
+    create_table :pictures, :force => true do |t|
+      t.integer :developer_id, :null => false
+      t.string :filename
+    end
+    add_index :pictures, :developer_id, :unique => true
-
-    create_table :posts, :force => true do |t|
-      t.integer :author_id

activerecord/test/models/developer.rb

@@ -42 +42 @@
-  has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'
-
-  has_many :audit_logs
+  
+  has_one :picture
-
-  validates_inclusion_of :salary, :in => 50000..200000
-  validates_length_of    :name, :within => 3..20

activerecord/test/cases/associations/eager_test.rb

@@ -7 +7 @@
-require 'models/company'
-require 'models/person'
-require 'models/reader'
+require 'models/developer'
+require 'models/picture'
+require 'models/avatar'
-
-class EagerAssociationTest < ActiveRecord::TestCase
-  fixtures :posts, :comments, :authors, :categories, :categories_posts,
-
+, :developers
-
-  def test_loading_with_one_association
-    posts = Post.find(:all, :include => :comments)
@@ -371 +374 @@
-    post = SpecialPost.find(posts(:thinking).id, :include => :taggings)
-    assert post.taggings.include?(taggings(:thinking_general))
-  end
+  
+  def test_preload_with_nested_includes
+    # none of the developers have a picture, but should still be able to include it
+    assert_equal 0, Picture.count
+    assert_equal 11, Developer.find(:all, :include => { :picture => :small_avatar }).size
+    
+    # give david a picture
+    david = developers(:david)
+    assert_difference 'Avatar.count', 2 do
+      david.create_picture :filename => 'david.jpg'
+    end
+    
+    # now that a developer does have a picture, both pictures and nested association avatar should be preloaded
+    assert_equal david.picture.small_avatar, Developer.find(developers(:david).id, :include => { :picture => :small_avatar }).picture.small_avatar
+  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

activerecord/lib/active_record/association_preload.rb

@@ -20 +20 @@
-            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]
-
+.compact
-            unless parents.empty?
-              parents.first.class.preload_associations(parents, child)
-            end
@@ -203 +203 @@
-          conditions = "#{reflection.klass.table_name}.#{foreign_key} IN (?)"
-        end
-
-(
+_for_association(reflection, 
-
-        reflection.klass.find(:all,
-                              :select => (options[:select] || "#{table_name}.*"),
@@ -225 +225 @@
-        sql << " AND (#{sanitize_sql preload_options[:conditions]})" if preload_options[:conditions]
-        sql
-      end
+      
+      def append_conditions_for_association(reflection, options, preload_options)
+        sql = ""
+        sql << " AND (#{interpolate_sql_for_preload(reflection.klass.send(:sanitize_sql, options[:conditions]))})" if options[:conditions]
+        sql << " AND (#{reflection.klass.send(:sanitize_sql, preload_options[:conditions])})" if preload_options[:conditions]
+        sql
+      end
-
-    end
-  end