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/reader.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activerecord/test/models/reader.rb')

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