diff options
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 2 |
2 files changed, 2 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 fdeadfc181..f9ca655560 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -68,7 +68,7 @@ module ActiveRecord else conditions = "#{@finder_sql}" if sanitized_conditions = sanitize_sql(options[:conditions]) - conditions << " AND #{sanitized_conditions}" + conditions << " AND (#{sanitized_conditions})" end options[:conditions] = conditions diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 03123758ef..6f655df26f 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -350,7 +350,7 @@ module ActiveRecord #:nodoc: return args.first if args.first.kind_of?(Array) && args.first.empty? expects_array = args.first.kind_of?(Array) - conditions = " AND #{sanitize_sql(options[:conditions])}" if options[:conditions] + conditions = " AND (#{sanitize_sql(options[:conditions])})" if options[:conditions] ids = args.flatten.compact.uniq case ids.size |