Fix eager loading of composite primary key associations

Co-Authored-By: Christine Belan <[email protected]>

Author: nvasilevski

activerecord/lib/active_record/associations/join_dependency.rb

@@ -254,10 +254,10 @@ def construct(ar_parent, parent, row, seen, model_cache, strict_loading_value)
 
             if node.primary_key
               keys = Array(node.primary_key).map { |column| aliases.column_alias(node, column) }
-              ids = keys.map { |key| row[key] }
+              id = keys.map { |key| row[key] }
             else
               keys = Array(node.reflection.join_primary_key).map { |column| aliases.column_alias(node, column.to_s) }
-              ids = keys.map { nil } # Avoid id-based model caching.
+              id = keys.map { nil } # Avoid id-based model caching.
             end
 
             if keys.any? { |key| row[key].nil? }
@@ -266,11 +266,9 @@ def construct(ar_parent, parent, row, seen, model_cache, strict_loading_value)
               next
             end
 
-            ids.each do |id|
-              unless model = seen[ar_parent][node][id]
-                model = construct_model(ar_parent, node, row, model_cache, id, strict_loading_value)
-                seen[ar_parent][node][id] = model if id
-              end
+            unless model = seen[ar_parent][node][id]
+              model = construct_model(ar_parent, node, row, model_cache, id, strict_loading_value)
+              seen[ar_parent][node][id] = model if id
             end
 
             construct(model, node, row, seen, model_cache, strict_loading_value)

activerecord/test/cases/associations/eager_test.rb

@@ -1729,6 +1729,26 @@ def test_preloading_has_many_through_with_custom_scope
     assert_equal(expected_tag_ids.sort, blog_post.tags.map(&:id).sort)
   end
 
+  test "preloading belongs_to CPK model with one of the keys being shared between models" do
+    post1 = Cpk::Post.create!(title: "post1", author: "the_same_author")
+    Cpk::Comment.create!(post: post1, text: "great post1!")
+
+    post2 = Cpk::Post.create!(title: "post2", author: "the_same_author")
+    Cpk::Comment.create!(post: post2, text: "great post2!")
+
+    comments = Cpk::Comment.eager_load(:post).to_a
+    expected = {
+      "great post1!" => "post1",
+      "great post2!" => "post2"
+    }
+
+    actual = comments.each_with_object({}) do |comment, hash|
+      hash[comment.text] = comment.post.title
+    end
+
+    assert_equal expected, actual
+  end
+
   test "preloading belongs_to with cpk" do
     order = Cpk::Order.create!(shop_id: 2)
     order_agreement = Cpk::OrderAgreement.create!(order: order)

activerecord/test/models/cpk/comment.rb

@@ -4,5 +4,6 @@ module Cpk
   class Comment < ActiveRecord::Base
     self.table_name = :cpk_comments
     belongs_to :commentable, class_name: "Cpk::Post", query_constraints: %i[commentable_title commentable_author], polymorphic: true
+    belongs_to :post, class_name: "Cpk::Post", query_constraints: %i[commentable_title commentable_author]
   end
 end

activerecord/test/schema/schema.rb

@@ -270,6 +270,7 @@
     t.string :commentable_title
     t.string :commentable_author
     t.string :commentable_type
+    t.text :text
   end
 
   create_table :cpk_reviews, force: true do |t|