diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-06-28 14:41:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 14:41:59 -0400 |
| commit | 33de72667a026f8a9c188189bcc191976a7c397a (patch) | |
| tree | c3f33e633acb9f8caa2c2cf06f966ab89e3952b7 /activerecord/lib/active_record/associations/collection_association.rb | |
| parent | f94b2e850330ae9b69c874d1fad8a4a38d736d36 (diff) | |
| parent | eacec5defe89dd9593d44f4831aa861a2e0e55d4 (diff) | |
| download | rails-33de72667a026f8a9c188189bcc191976a7c397a.tar.gz rails-33de72667a026f8a9c188189bcc191976a7c397a.tar.bz2 rails-33de72667a026f8a9c188189bcc191976a7c397a.zip | |
Merge pull request #29610 from kamipo/dont_passing_klass_connection_to_association_scope
Don't passing `klass.connection` to `AssociationScope`
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
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 583ee11907..bbf3dbb75e 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -304,7 +304,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 |