Merge pull request #27566 from npezza93/singular_collection_ids-fix

Fix collection_singular_ids= ignores different primary key on relationhip

activerecord/lib/active_record/associations/collection_association.rb

@@ -61,10 +61,17 @@ def ids_reader
 
       # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
       def ids_writer(ids)
-        pk_type = reflection.primary_key_type
-        ids = Array(ids).reject { |id| id.blank? }
-        ids.map! { |i| pk_type.type_cast_from_user(i) }
-        replace(klass.find(ids).index_by { |r| r.id }.values_at(*ids))
+        pk_column = reflection.association_primary_key
+        pk_type = klass.type_for_attribute(pk_column)
+        ids = Array(ids).reject(&:blank?).map do |i|
+          pk_type.type_cast_from_user(i)
+        end
+
+        if (objs = klass.where(pk_column => ids)).size == ids.size
+          replace(objs.index_by { |r| r.send(pk_column) }.values_at(*ids))
+        else
+          objs.raise_record_not_found_exception!(ids, objs.size, ids.size)
+        end
       end
 
       def reset

activerecord/test/cases/associations/has_many_through_associations_test.rb

@@ -26,12 +26,15 @@
 require 'models/membership'
 require 'models/club'
 require 'models/organization'
+require 'models/user'
+require 'models/user_business'
+require 'models/business'
 
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
   fixtures :posts, :readers, :people, :comments, :authors, :categories, :taggings, :tags,
            :owners, :pets, :toys, :jobs, :references, :companies, :members, :author_addresses,
            :subscribers, :books, :subscriptions, :developers, :categorizations, :essays,
-           :categories_posts, :clubs, :memberships, :organizations
+           :categories_posts, :clubs, :memberships, :organizations, :users, :businesses
 
   # Dummies to force column loads so query counts are clean.
   def setup
@@ -1201,4 +1204,11 @@ def test_has_many_through_do_not_cache_association_reader_if_the_though_method_h
   ensure
     TenantMembership.current_member = nil
   end
+
+  def test_singular_collection_ids_are_set_correctly
+    @user = users(:one)
+    assert @user.businesses.empty?
+    @user.business_ids = [businesses(:walmart).uuid]
+    assert @user.businesses.include?(businesses(:walmart))
+  end
 end

activerecord/test/fixtures/businesses.yml

@@ -0,0 +1,3 @@
+walmart:
+  name: walmart
+  uuid: <%= SecureRandom.uuid %>

activerecord/test/fixtures/users.yml

@@ -0,0 +1,2 @@
+one:
+  name: Bob Smith

activerecord/test/models/business.rb

@@ -0,0 +1,2 @@
+class Business < ActiveRecord::Base
+end

activerecord/test/models/user.rb

@@ -0,0 +1,4 @@
+class User < ActiveRecord::Base
+  has_many :user_businesses
+  has_many :businesses, through: :user_businesses
+end

activerecord/test/models/user_business.rb

@@ -0,0 +1,4 @@
+class UserBusiness < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :business, primary_key: :uuid
+end

activerecord/test/schema/schema.rb

@@ -798,6 +798,20 @@ def except(adapter_names_to_exclude)
     t.integer :car_id
   end
 
+  create_table :users, force: true do |t|
+    t.string :name
+  end
+
+  create_table :user_businesses, force: true do |t|
+    t.belongs_to :user
+    t.string :business_id, index: true
+  end
+
+  create_table :businesses, force: true do |t|
+    t.string :name
+    t.string :uuid
+  end
+
   create_table :variants, force: true do |t|
     t.references :product
     t.string     :name