aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDaniel Colson <danieljamescolson@gmail.com>2017-01-31 17:12:19 -0500
committerDaniel Colson <danieljamescolson@gmail.com>2017-02-02 22:26:49 -0500
commit796d8599f384c7da41318695028d60e62738beb0 (patch)
treeceb29c5fbe9b19828a6a36664011f99ea9c9e460 /activerecord/lib
parent91c6eb602ad72c5b830cd5242f39768f90cf72dc (diff)
downloadrails-796d8599f384c7da41318695028d60e62738beb0.tar.gz
rails-796d8599f384c7da41318695028d60e62738beb0.tar.bz2
rails-796d8599f384c7da41318695028d60e62738beb0.zip
Fix collection_singular_ids= bug
When the association's primary key is manually set as a symbol and called with an array of strings, CollectionAssociation#ids_writer fails to cast the ids to integers. This is because AssociationReflection#association_primary_key_type and ThroughReflection#association_primary_key_type return the incorrect type, since ModelSchema.type_for_attribute only accepts a string. The result is an ActiveRecord::RecordNotFound error.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/reflection.rb4
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.