Changeset 8894

Timestamp:

02/18/08 04:49:56 (2 years ago)

Author:

nzkoz

Message:

Ensure nested preloading works when associations return nil. Closes #11145 [GMFlash]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/association_preload.rb (modified) (1 diff)
• trunk/activerecord/test/cases/associations/eager_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure association preloading doesn't break when an association returns nil. ##11145 [GMFlash]
-
-* Make dynamic finders respect the :include on HasManyThrough associations.  #10998. [cpytel]

trunk/activerecord/lib/active_record/association_preload.rb

@@ -22 +22 @@
-            reflection = reflections[parent]
-            parents = records.map {|record| record.send(reflection.name)}.flatten
-
+ || parents.first.nil?
-              parents.first.class.preload_associations(parents, child)
-            end

trunk/activerecord/test/cases/associations/eager_test.rb

@@ -75 +75 @@
-  def test_loading_with_no_associations
-    assert_nil Post.find(posts(:authorless).id, :include => :author).author
+  end
+
+  def test_nested_loading_with_no_associations
+    assert_nothing_raised do
+      Post.find(posts(:authorless).id, :include => {:author => :author_addresss})
+    end
-  end
-