Merge pull request #26380 from kamipo/pass_set_inverse_instance_block

Pass `set_inverse_instance` block to `sc.execute` for `SingularAssociation`
2016-09-08 20:28:22 +02:00 · 2016-09-08 20:28:22 +02:00 · cf5f55cd30
commit cf5f55cd30
parent 087427e0d1 a0aea912e4
1 changed files with 2 additions and 2 deletions
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@ -48,9 +48,9 @@ def find_target
          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)