diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-09-26 15:41:31 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-09-26 15:42:34 +0100 |
| commit | 3b87c38d029c1626161a3e7699d40da3e789d7cb (patch) | |
| tree | b056af6ff031bf5ee83e9d8a25307ae72668d97a /activerecord/test | |
| parent | 5c0e9333c0973123fb1ce2cde68a1c211d422f91 (diff) | |
| download | rails-3b87c38d029c1626161a3e7699d40da3e789d7cb.tar.gz rails-3b87c38d029c1626161a3e7699d40da3e789d7cb.tar.bz2 rails-3b87c38d029c1626161a3e7699d40da3e789d7cb.zip | |
Fix belongs_to polymorphic with custom primary key on target.
Closes #3104.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 8 | ||||
| -rw-r--r-- | activerecord/test/cases/reflection_test.rb | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 866a3cca10..1160d236c9 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -13,6 +13,7 @@ require 'models/comment' require 'models/sponsor' require 'models/member' require 'models/essay' +require 'models/toy' class BelongsToAssociationsTest < ActiveRecord::TestCase fixtures :accounts, :companies, :developers, :projects, :topics, @@ -696,4 +697,11 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase assert_equal nil, comment.reload.parent assert_equal 0, comments(:greetings).reload.children_count end + + def test_polymorphic_with_custom_primary_key + toy = Toy.create! + sponsor = Sponsor.create!(:sponsorable => toy) + + assert_equal toy, sponsor.reload.sponsorable + end end diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb index 41312e8661..0a48f418b1 100644 --- a/activerecord/test/cases/reflection_test.rb +++ b/activerecord/test/cases/reflection_test.rb @@ -244,7 +244,6 @@ class ReflectionTest < ActiveRecord::TestCase # Normal association assert_equal "id", Author.reflect_on_association(:posts).association_primary_key.to_s assert_equal "name", Author.reflect_on_association(:essay).association_primary_key.to_s - assert_equal "id", Tagging.reflect_on_association(:taggable).association_primary_key.to_s # Through association (uses the :primary_key option from the source reflection) assert_equal "nick", Author.reflect_on_association(:subscribers).association_primary_key.to_s |