aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/collection_association.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-06-25 20:58:20 +0900
committerRyuta Kamizono <kamipo@gmail.com>2017-06-29 01:26:18 +0900
commiteacec5defe89dd9593d44f4831aa861a2e0e55d4 (patch)
treebe04e33711ca401019c985cc266b6ee8cc942999 /activerecord/lib/active_record/associations/collection_association.rb
parentbf7606d4ebae24e7ba49e34190c21cbad0a98640 (diff)
downloadrails-eacec5defe89dd9593d44f4831aa861a2e0e55d4.tar.gz
rails-eacec5defe89dd9593d44f4831aa861a2e0e55d4.tar.bz2
rails-eacec5defe89dd9593d44f4831aa861a2e0e55d4.zip
Don't passing `klass.connection` to `AssociationScope`
Passing `klass.connection` is redundant because `AssociationScope` is passed an association itself and an association has `klass`.
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/collection_association.rb2
1 files changed, 1 insertions, 1 deletions
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