0
@@ -96,7 +96,7 @@ module ActiveRecord
0
         options = reflection.options
0
 
0
         conditions = "t0.#{reflection.primary_key_name} #{in_or_equals_for_ids(ids)}"
0
-        conditions << append_conditions(options, preload_options)
0
+        conditions << append_conditions(reflection, preload_options)
0
 
0
         associated_records = reflection.klass.find(:all, :conditions => [conditions, ids],
0
         :include => options[:include],
0
@@ -233,7 +233,7 @@ module ActiveRecord
0
             end
0
           end
0
           conditions = "#{table_name}.#{connection.quote_column_name(primary_key)} #{in_or_equals_for_ids(ids)}"
0
-          conditions << append_conditions(options, preload_options)
0
+          conditions << append_conditions(reflection, preload_options)
0
           associated_records = klass.find(:all, :conditions => [conditions, ids],
0
                                           :include => options[:include],
0
                                           :select => options[:select],
0
@@ -254,7 +254,7 @@ module ActiveRecord
0
           conditions = "#{reflection.klass.quoted_table_name}.#{foreign_key} #{in_or_equals_for_ids(ids)}"
0
         end
0
 
0
-        conditions << append_conditions(options, preload_options)
0
+        conditions << append_conditions(reflection, preload_options)
0
 
0
         reflection.klass.find(:all,
0
                               :select => (preload_options[:select] || options[:select] || "#{table_name}.*"),
0
@@ -270,9 +270,9 @@ module ActiveRecord
0
         instance_eval("%@#{sql.gsub('@', '\@')}@")
0
       end
0
 
0
-      def append_conditions(options, preload_options)
0
+      def append_conditions(reflection, preload_options)
0
         sql = ""
0
-        sql << " AND (#{interpolate_sql_for_preload(sanitize_sql(options[:conditions]))})" if options[:conditions]
0
+        sql << " AND (#{interpolate_sql_for_preload(reflection.sanitized_conditions)})" if reflection.sanitized_conditions
0
         sql << " AND (#{sanitize_sql preload_options[:conditions]})" if preload_options[:conditions]
0
         sql
0
       end

0
@@ -112,6 +112,10 @@ module ActiveRecord
0
         name == other_aggregation.name && other_aggregation.options && active_record == other_aggregation.active_record
0
       end
0
 
0
+      def sanitized_conditions #:nodoc:
0
+        @sanitized_conditions ||= klass.send(:sanitize_sql, options[:conditions]) if options[:conditions]
0
+      end
0
+
0
       private
0
         def derive_class_name
0
           name.to_s.camelize