From 4596e16f1a55629ed2934abcd4fc386641d32c30 Mon Sep 17 00:00:00 2001
From: Santosh Wadghule <santosh.wadghule@gmail.com>
Date: Mon, 30 Mar 2015 04:06:10 +0530
Subject: [PATCH] Fix eager loading association using default_scope for finder
 methods.

- Eager loading was not working for the default_scope (class method)
  for 'find' & 'find_by' methods.
- Fixed these by adding a new check 'respond_to?(:default_scope)'.
---
 .../lib/active_record/scoping/default.rb        |  2 +-
 .../test/cases/associations/eager_test.rb       | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/activerecord/lib/active_record/scoping/default.rb b/activerecord/lib/active_record/scoping/default.rb
index 5ec2c88b47..3590b8846e 100644
--- a/activerecord/lib/active_record/scoping/default.rb
+++ b/activerecord/lib/active_record/scoping/default.rb
@@ -35,7 +35,7 @@ def unscoped
 
         # Are there attributes associated with this scope?
         def scope_attributes? # :nodoc:
-          super || default_scopes.any?
+          super || default_scopes.any? || respond_to?(:default_scope)
         end
 
         def before_remove_const #:nodoc:
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 7d8b933992..0ecf2ddfd1 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -759,6 +759,23 @@ def test_eager_with_default_scope_as_class_method
     end
   end
 
+  def test_eager_with_default_scope_as_class_method_using_find_method
+    david = developers(:david)
+    developer = EagerDeveloperWithClassMethodDefaultScope.find(david.id)
+    projects = Project.order(:id).to_a
+    assert_no_queries do
+      assert_equal(projects, developer.projects)
+    end
+  end
+
+  def test_eager_with_default_scope_as_class_method_using_find_by_method
+    developer = EagerDeveloperWithClassMethodDefaultScope.find_by(name: 'David')
+    projects = Project.order(:id).to_a
+    assert_no_queries do
+      assert_equal(projects, developer.projects)
+    end
+  end
+
   def test_eager_with_default_scope_as_lambda
     developer = EagerDeveloperWithLambdaDefaultScope.where(:name => 'David').first
     projects = Project.order(:id).to_a