diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-12 21:14:42 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-08-12 21:17:30 -0300 |
commit | dc3230b156a4cfe5a8fbe3636edf0117f8e122cc (patch) | |
tree | 39d6984b72453429a1bd1752bc604fa82dce006d /activerecord/lib/active_record/associations/singular_association.rb | |
parent | a4f780947299cc35f14c9e1825278155ae88ee44 (diff) | |
download | rails-dc3230b156a4cfe5a8fbe3636edf0117f8e122cc.tar.gz rails-dc3230b156a4cfe5a8fbe3636edf0117f8e122cc.tar.bz2 rails-dc3230b156a4cfe5a8fbe3636edf0117f8e122cc.zip |
Skip statement cache on through association reader
If the through class has default scopes we should skip the statement
cache.
Closes #20745.
Diffstat (limited to 'activerecord/lib/active_record/associations/singular_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/singular_association.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb index 30c5d72482..03cb8cb8c3 100644 --- a/activerecord/lib/active_record/associations/singular_association.rb +++ b/activerecord/lib/active_record/associations/singular_association.rb @@ -47,12 +47,7 @@ module ActiveRecord end def get_records - if reflection.scope_chain.any?(&:any?) || - scope.eager_loading? || - klass.scope_attributes? - - return scope.limit(1).to_a - end + return scope.limit(1).to_a if skip_statement_cache? conn = klass.connection sc = reflection.association_scope_cache(conn, owner) do |