aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-05-11 18:19:39 +0100
committerJon Leighton <j@jonathanleighton.com>2012-05-11 20:11:04 +0100
commit8f50bbee31ca4b2cc2ac9b9889c421f6a38d97f4 (patch)
tree7bfe53996ad57dcd2e9ef84fe2d25574ab12d066 /activerecord
parentc86a32d7451c5d901620ac58630460915292f88b (diff)
downloadrails-8f50bbee31ca4b2cc2ac9b9889c421f6a38d97f4.tar.gz
rails-8f50bbee31ca4b2cc2ac9b9889c421f6a38d97f4.tar.bz2
rails-8f50bbee31ca4b2cc2ac9b9889c421f6a38d97f4.zip
set_owner_attributes is covered by the scoping
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/collection_proxy.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb
index 47ed9f58d8..66815d83bc 100644
--- a/activerecord/lib/active_record/associations/collection_proxy.rb
+++ b/activerecord/lib/active_record/associations/collection_proxy.rb
@@ -84,10 +84,9 @@ module ActiveRecord
def method_missing(method, *args, &block)
match = DynamicMatchers::Method.match(self, method)
if match && match.is_a?(DynamicMatchers::Instantiator)
- super do |r|
- proxy_association.send :set_owner_attributes, r
- proxy_association.send :add_to_target, r
- yield(r) if block_given?
+ super do |record|
+ proxy_association.add_to_target(record)
+ yield record if block_given?
end
elsif target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method))