From 58d35f62110d4280818d49f6a76b3bdaa1ee217a Mon Sep 17 00:00:00 2001 From: Pratik Naik 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/lib/active_record/associations/preloader/association.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'activerecord/lib/active_record/associations/preloader') diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb index 779f8164cc..85b1040049 100644 --- a/activerecord/lib/active_record/associations/preloader/association.rb +++ b/activerecord/lib/active_record/associations/preloader/association.rb @@ -117,9 +117,7 @@ module ActiveRecord conditions = klass.send(:instance_eval, &conditions) end - if conditions - klass.send(:sanitize_sql, conditions) - end + conditions end end end -- cgit v1.2.3