From eacec5defe89dd9593d44f4831aa861a2e0e55d4 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 25 Jun 2017 20:58:20 +0900 Subject: Don't passing `klass.connection` to `AssociationScope` Passing `klass.connection` is redundant because `AssociationScope` is passed an association itself and an association has `klass`. --- activerecord/lib/active_record/associations/collection_association.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/associations/collection_association.rb') diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 0cb17b47e8..c5ed6d41dd 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -307,7 +307,7 @@ module ActiveRecord sc = reflection.association_scope_cache(conn, owner) do StatementCache.create(conn) { |params| as = AssociationScope.create { params.bind } - target_scope.merge as.scope(self, conn) + target_scope.merge!(as.scope(self)) } end -- cgit v1.2.3