aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSean Griffin <sean@thoughtbot.com>2015-07-18 08:42:29 -0400
committerSean Griffin <sean@thoughtbot.com>2015-07-18 08:44:24 -0400
commit68af63618223c238468af1afb093eb4ccc706761 (patch)
treec265cfe4ae7322445bdfe3bc6aae197086477bd1 /activerecord/lib/active_record
parentc7449a2269c3d8b3f68b93401ab7a4fc524da918 (diff)
downloadrails-68af63618223c238468af1afb093eb4ccc706761.tar.gz
rails-68af63618223c238468af1afb093eb4ccc706761.tar.bz2
rails-68af63618223c238468af1afb093eb4ccc706761.zip
Ensure that `ActionController::Parameters` can still be passed to AR
Since nested hashes are also instances of `ActionController::Parameters`, and we're explicitly looking to work with a hash for nested attributes, this caused breakage in several points. This is the minimum viable fix for the issue (and one that I'm not terribly fond of). I can't think of a better place to handle this at the moment. I'd prefer to use some sort of solution that doesn't special case AC::Parameters, but we can't use something like `to_h` or `to_a` since `Enumerable` adds both. While I've added a trivial test case for verifying this fix in isolation, we really need better integration coverage to prevent regressions like this in the future. We don't actually have a lot of great places for integration coverage at the moment, so I'm deferring it for now. Fixes #20922.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/nested_attributes.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/nested_attributes.rb b/activerecord/lib/active_record/nested_attributes.rb
index c942d0e265..c337e1d18f 100644
--- a/activerecord/lib/active_record/nested_attributes.rb
+++ b/activerecord/lib/active_record/nested_attributes.rb
@@ -386,6 +386,9 @@ module ActiveRecord
# then the existing record will be marked for destruction.
def assign_nested_attributes_for_one_to_one_association(association_name, attributes)
options = self.nested_attributes_options[association_name]
+ if attributes.respond_to?(:permitted?)
+ attributes = attributes.to_h
+ end
attributes = attributes.with_indifferent_access
existing_record = send(association_name)