Avoid sanitize_sql when we can use Relation#where instead

1 files changed, 6 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 779f8164cc..253998fb23 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -95,8 +95,8 @@ module ActiveRecord
         def build_scope
           scope = klass.scoped
 
-          scope = scope.where(process_conditions(options[:conditions]))
-          scope = scope.where(process_conditions(preload_options[:conditions]))
+          scope = scope.where(interpolate(options[:conditions]))
+          scope = scope.where(interpolate(preload_options[:conditions]))
 
           scope = scope.select(preload_options[:select] || options[:select] || table[Arel.star])
           scope = scope.includes(preload_options[:include] || options[:include])
@@ -112,13 +112,11 @@ module ActiveRecord
           scope
         end
 
-        def process_conditions(conditions)
+        def interpolate(conditions)
           if conditions.respond_to?(:to_proc)
-            conditions = klass.send(:instance_eval, &conditions)
-          end
-
-          if conditions
-            klass.send(:sanitize_sql, conditions)
+            klass.send(:instance_eval, &conditions)
+          else
+            conditions
           end
         end
       end