From f8b53f35b9cbf2a134a7d9184a044ce95764acfa Mon Sep 17 00:00:00 2001
From: Robert Pankowecki <robert.pankowecki@gmail.com>
Date: Tue, 27 Jul 2010 22:57:27 +0200
Subject: test and fix collection_singular_ids= with string primary keys [#5125
 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 activerecord/lib/active_record/associations.rb     |  4 ++-
 .../has_many_through_associations_test.rb          | 40 +++++++++++++++++++++-
 activerecord/test/fixtures/subscriptions.yml       |  2 +-
 activerecord/test/models/book.rb                   |  3 ++
 4 files changed, 46 insertions(+), 3 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 9663a36edf..bd90cfc5d5 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1439,7 +1439,9 @@ module ActiveRecord
             end
             
             redefine_method("#{reflection.name.to_s.singularize}_ids=") do |new_value|
-              ids = (new_value || []).reject { |nid| nid.blank? }.map(&:to_i)
+              pk_column = reflection.klass.columns.find{|c| c.name == reflection.klass.primary_key }
+              ids = (new_value || []).reject { |nid| nid.blank? }
+              ids.map!{|i| pk_column.type_cast(i)}
               send("#{reflection.name}=", reflection.klass.find(ids).index_by(&:id).values_at(*ids))
             end
           end
diff --git a/activerecord/test/cases/associations/has_many_through_associations_test.rb b/activerecord/test/cases/associations/has_many_through_associations_test.rb
index e4dd810732..3940e75ad6 100644
--- a/activerecord/test/cases/associations/has_many_through_associations_test.rb
+++ b/activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -14,9 +14,14 @@ require 'models/toy'
 require 'models/contract'
 require 'models/company'
 require 'models/developer'
+require 'models/subscriber'
+require 'models/book'
+require 'models/subscription'
 
 class HasManyThroughAssociationsTest < ActiveRecord::TestCase
-  fixtures :posts, :readers, :people, :comments, :authors, :owners, :pets, :toys, :jobs, :references, :companies
+  fixtures :posts, :readers, :people, :comments, :authors, 
+           :owners, :pets, :toys, :jobs, :references, :companies, 
+           :subscribers, :books, :subscriptions
 
   # Dummies to force column loads so query counts are clean.
   def setup
@@ -383,4 +388,37 @@ class HasManyThroughAssociationsTest < ActiveRecord::TestCase
       lambda { authors(:david).very_special_comments.delete(authors(:david).very_special_comments.first) },
     ].each {|block| assert_raise(ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection, &block) }
   end
+
+  def test_collection_singular_ids_getter_with_string_primary_keys
+    book = books(:awdr)
+    assert_equal 2, book.subscriber_ids.size
+    assert_equal [subscribers(:first).nick, subscribers(:second).nick].sort, book.subscriber_ids.sort
+  end
+
+  def test_collection_singular_ids_setter
+    company = companies(:rails_core)
+    dev = Developer.find(:first)
+
+    company.developer_ids = [dev.id]
+    assert_equal [dev], company.developers
+  end
+
+  def test_collection_singular_ids_setter_with_string_primary_keys
+    assert_nothing_raised do
+      book = books(:awdr)
+      book.subscriber_ids = [subscribers(:second).nick]
+      assert_equal [subscribers(:second)], book.subscribers(true)
+
+      book.subscriber_ids = []
+      assert_equal [], book.subscribers(true)
+    end
+
+  end
+
+  def test_collection_singular_ids_setter_raises_exception_when_invalid_ids_set
+    company = companies(:rails_core)
+    ids =  [Developer.find(:first).id, -9999]
+    assert_raises(ActiveRecord::RecordNotFound) {company.developer_ids= ids}
+  end
+
 end
diff --git a/activerecord/test/fixtures/subscriptions.yml b/activerecord/test/fixtures/subscriptions.yml
index 371bfd3422..5a93c12193 100644
--- a/activerecord/test/fixtures/subscriptions.yml
+++ b/activerecord/test/fixtures/subscriptions.yml
@@ -9,4 +9,4 @@ webster_rfr:
 alterself_awdr:
   id: 3
   subscriber_id: alterself
-  book_id: 3
\ No newline at end of file
+  book_id: 1
diff --git a/activerecord/test/models/book.rb b/activerecord/test/models/book.rb
index cfd07abddc..1e030b4f59 100644
--- a/activerecord/test/models/book.rb
+++ b/activerecord/test/models/book.rb
@@ -1,4 +1,7 @@
 class Book < ActiveRecord::Base
   has_many :citations, :foreign_key => 'book1_id'
   has_many :references, :through => :citations, :source => :reference_of, :uniq => true
+
+  has_many :subscriptions
+  has_many :subscribers, :through => :subscriptions
 end
-- 
cgit v1.2.3