Add a test to make sure preloading properly merges association and default scope conditions

2 files changed, 11 insertions, 0 deletions

diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 9c5b7310ff..c995f59a15 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -119,6 +119,9 @@ class Post < ActiveRecord::Base
   has_many :skimmers, -> { where :skimmer => true }, :class_name => 'Reader'
   has_many :impatient_people, :through => :skimmers, :source => :person
 
+  has_many :lazy_readers
+  has_many :lazy_readers_skimmers_or_not, -> { where(skimmer: [ true, false ]) }, :class_name => 'LazyReader'
+
   def self.top(limit)
     ranked_by_comments.limit_by(limit)
   end
diff --git a/activerecord/test/models/reader.rb b/activerecord/test/models/reader.rb
index 59005ac604..f5b6079bd2 100644
--- a/activerecord/test/models/reader.rb
+++ b/activerecord/test/models/reader.rb
@@ -12,3 +12,11 @@ class SecureReader < ActiveRecord::Base
 
   attr_accessible nil
 end
+
+class LazyReader < ActiveRecord::Base
+  self.table_name = "readers"
+  default_scope -> { where(skimmer: true) }
+
+  belongs_to :post
+  belongs_to :person
+end