From fed6ac9c66e87d120098b3a4ffb15699d0ee6863 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Thu, 26 Sep 2013 14:55:10 -0400 Subject: fix inverse_of when find_or_initialize_by_* inverse_of relation was not being set when calling find_or_initialize_by_ and the entry was found on the db. --- .../lib/active_record/associations/collection_proxy.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'activerecord/lib/active_record/associations') diff --git a/activerecord/lib/active_record/associations/collection_proxy.rb b/activerecord/lib/active_record/associations/collection_proxy.rb index 416a5823c6..62cdb1ea87 100644 --- a/activerecord/lib/active_record/associations/collection_proxy.rb +++ b/activerecord/lib/active_record/associations/collection_proxy.rb @@ -77,10 +77,12 @@ module ActiveRecord def method_missing(method, *args, &block) match = DynamicFinderMatch.match(method) if match && match.instantiator? - send(:find_or_instantiator_by_attributes, match, match.attribute_names, *args) do |r| - proxy_association.send :set_owner_attributes, r - proxy_association.send :add_to_target, r - yield(r) if block_given? + send(:find_or_instantiator_by_attributes, match, match.attribute_names, *args) do |record| + proxy_association.send :set_owner_attributes, record + proxy_association.send :add_to_target, record + yield(record) if block_given? + end.tap do |record| + proxy_association.send :set_inverse_instance, record end elsif target.respond_to?(method) || (!proxy_association.klass.respond_to?(method) && Class.respond_to?(method)) -- cgit v1.2.3