From a0aea912e4bd8932ec1d833b0a718d9192356083 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sat, 3 Sep 2016 19:02:31 +0900 Subject: Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation` Follow up to caa178c. caa178c updated all code which sets inverse instances on newly loaded associations to use block. But `SingularAssociation` was forgotten it. --- activerecord/lib/active_record/associations/singular_association.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/associations/singular_association.rb') diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb index 1fe9a23263..5445ca34a8 100644 --- a/activerecord/lib/active_record/associations/singular_association.rb +++ b/activerecord/lib/active_record/associations/singular_association.rb @@ -56,9 +56,9 @@ module ActiveRecord end binds = AssociationScope.get_bind_values(owner, reflection.chain) - if record = sc.execute(binds, klass, conn).first + sc.execute(binds, klass, conn) do |record| set_inverse_instance record - end + end.first end def replace(record) -- cgit v1.2.3