From 9bd43868502f5e8a67649ffb5e766853a05714c5 Mon Sep 17 00:00:00 2001
From: alfa-jpn <a.nkmr.ja@gmail.com>
Date: Sat, 8 Nov 2014 17:03:54 +0900
Subject: default scopes should break the cache on singulur_association.

fixes #17495
---
 activerecord/lib/active_record/associations/singular_association.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activerecord/lib/active_record/associations')

diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index c360ef1b2c..c44242a0f0 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -41,7 +41,8 @@ module ActiveRecord
         def get_records
           if reflection.scope_chain.any?(&:any?) ||
               scope.eager_loading? ||
-              klass.current_scope
+              klass.current_scope ||
+              klass.default_scopes.any?
 
             return scope.limit(1).to_a
           end
-- 
cgit v1.2.3