aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-02-03 10:16:53 -0500
committerGitHub <noreply@github.com>2017-02-03 10:16:53 -0500
commit3497f04d3682d4c9becc63565c962e91b0d7aea2 (patch)
tree9d8d55268b840fdda4e7160a431fdd4b26870507 /activerecord/test
parent26a137b946d2e1e54993eebc2b94cd278cd69c21 (diff)
parent796d8599f384c7da41318695028d60e62738beb0 (diff)
downloadrails-3497f04d3682d4c9becc63565c962e91b0d7aea2.tar.gz
rails-3497f04d3682d4c9becc63565c962e91b0d7aea2.tar.bz2
rails-3497f04d3682d4c9becc63565c962e91b0d7aea2.zip
Merge pull request #27865 from composerinteralia/collection-ids-setter-bug
Fix collection_singular_ids= bug
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/reflection_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/test/cases/reflection_test.rb b/activerecord/test/cases/reflection_test.rb
index 04ee67c177..c1c2efb9c8 100644
--- a/activerecord/test/cases/reflection_test.rb
+++ b/activerecord/test/cases/reflection_test.rb
@@ -335,6 +335,15 @@ class ReflectionTest < ActiveRecord::TestCase
assert_equal "custom_primary_key", Author.reflect_on_association(:tags_with_primary_key).association_primary_key.to_s # nested
end
+ def test_association_primary_key_type
+ # Normal Association
+ assert_equal :integer, Author.reflect_on_association(:posts).association_primary_key_type.type
+ assert_equal :string, Author.reflect_on_association(:essay).association_primary_key_type.type
+
+ # Through Association
+ assert_equal :string, Author.reflect_on_association(:essay_category).association_primary_key_type.type
+ end
+
def test_association_primary_key_raises_when_missing_primary_key
reflection = ActiveRecord::Reflection.create(:has_many, :edge, nil, {}, Author)
assert_raises(ActiveRecord::UnknownPrimaryKey) { reflection.association_primary_key }