Merge pull request #52619 from fatkodima/eager-load-nil-associations

Allow to eager load nested nil associations

activerecord/lib/active_record/associations/join_dependency.rb

@@ -61,7 +61,7 @@ def self.walk_tree(associations, hash)
         when Hash
           associations.each do |k, v|
             cache = hash[k] ||= {}
-            walk_tree v, cache
+            walk_tree v, cache if v
           end
         else
           raise ConfigurationError, associations.inspect

activerecord/test/cases/associations/cascaded_eager_loading_test.rb

@@ -77,6 +77,17 @@ def test_eager_association_loading_with_join_for_count
     assert_queries(3) { authors.to_a }
   end
 
+  def test_eager_association_loading_with_nil_associations
+    authors = Author.includes(nil).to_a
+    assert_equal 3, authors.size
+
+    authors = Author.includes([:posts, nil]).to_a
+    assert_equal 3, authors.size
+
+    authors = Author.includes(posts: nil).to_a
+    assert_equal 3, authors.size
+  end
+
   def test_eager_association_loading_with_cascaded_two_levels_with_two_has_many_associations
     authors = Author.all.merge!(includes: { posts: [:comments, :categorizations] }, order: "authors.id").to_a
     assert_equal 3, authors.size