Ensure default_scope can be overwriten by association conditions.

2 files changed, 6 insertions, 0 deletions

diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index fdf4536bc0..a50a4d4165 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -259,6 +259,11 @@ class HasManyScopingTest< ActiveRecord::TestCase
     assert_equal [magician], people(:michael).bad_references
   end
 
+  def test_should_default_scope_on_associations_is_overriden_by_association_conditions
+    person = people(:michael)
+    assert_equal [], people(:michael).fixed_bad_references
+  end
+
   def test_should_maintain_default_scope_on_eager_loaded_associations
     michael = Person.where(:id => people(:michael).id).includes(:bad_references).first
     magician = BadReference.find(1)
diff --git a/activerecord/test/models/person.rb b/activerecord/test/models/person.rb
index be7463f7c8..951ec93c53 100644
--- a/activerecord/test/models/person.rb
+++ b/activerecord/test/models/person.rb
@@ -5,6 +5,7 @@ class Person < ActiveRecord::Base
 
   has_many :references
   has_many :bad_references
+  has_many :fixed_bad_references, :conditions => { :favourite => true }, :class_name => 'BadReference'
   has_many :jobs, :through => :references
   has_one :favourite_reference, :class_name => 'Reference', :conditions => ['favourite=?', true]
   has_many :posts_with_comments_sorted_by_comment_id, :through => :readers, :source => :post, :include => :comments, :order => 'comments.id'