diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 847709df8c..9e94d70972 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -66,9 +66,11 @@ module ActiveRecord load_target.select { |record| ids.include?(record.id) } end else - if options[:conditions] = sanitize_sql(options[:conditions]) - options[:conditions] = "#{@finder_sql} AND #{options[:conditions]}" + conditions = "#{@finder_sql}" + if sanitized_conditions = sanitize_sql(options[:conditions]) + conditions << " AND #{sanitized_conditions}" end + options[:conditions] = conditions if options[:order] && @options[:order] options[:order] = "#{options[:order]}, #{@options[:order]}" |