From 58d35f62110d4280818d49f6a76b3bdaa1ee217a Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Tue, 28 Aug 2012 12:57:41 -0700
Subject: Ensure association preloading properly merges default scope and
 association conditions

Conflicts:

	activerecord/test/models/reader.rb
---
 activerecord/test/models/post.rb   | 4 ++++
 activerecord/test/models/reader.rb | 8 ++++++++
 2 files changed, 12 insertions(+)

(limited to 'activerecord/test/models')

diff --git a/activerecord/test/models/post.rb b/activerecord/test/models/post.rb
index 0fc22ac6a3..9aa02fa18f 100644
--- a/activerecord/test/models/post.rb
+++ b/activerecord/test/models/post.rb
@@ -117,6 +117,7 @@ class Post < ActiveRecord::Base
   has_many :readers
   has_many :secure_readers
   has_many :readers_with_person, :include => :person, :class_name => "Reader"
+
   has_many :people, :through => :readers
   has_many :secure_people, :through => :secure_readers
   has_many :single_people, :through => :readers
@@ -128,6 +129,9 @@ class Post < ActiveRecord::Base
   has_many :skimmers, :class_name => 'Reader', :conditions => { :skimmer => true }
   has_many :impatient_people, :through => :skimmers, :source => :person
 
+  has_many :lazy_readers
+  has_many :lazy_readers_skimmers_or_not, :conditions => { :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..9a1b539791 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
-- 
cgit v1.2.3