diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-02-03 10:16:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 10:16:53 -0500 |
| commit | 3497f04d3682d4c9becc63565c962e91b0d7aea2 (patch) | |
| tree | 9d8d55268b840fdda4e7160a431fdd4b26870507 /activerecord/lib | |
| parent | 26a137b946d2e1e54993eebc2b94cd278cd69c21 (diff) | |
| parent | 796d8599f384c7da41318695028d60e62738beb0 (diff) | |
| download | rails-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/lib')
| -rw-r--r-- | activerecord/lib/active_record/reflection.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 81ec4924b0..61a2279292 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -421,7 +421,7 @@ module ActiveRecord end def association_primary_key_type - klass.type_for_attribute(association_primary_key) + klass.type_for_attribute(association_primary_key.to_s) end def active_record_primary_key @@ -835,7 +835,7 @@ module ActiveRecord end def association_primary_key_type - klass.type_for_attribute(association_primary_key) + klass.type_for_attribute(association_primary_key.to_s) end # Gets an array of possible <tt>:through</tt> source reflection names in both singular and plural form. |