From 2a35baa0bb4312d95e1340074cce731afedecde0 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Sat, 24 Sep 2005 23:58:13 +0000 Subject: Wrap :conditions in parentheses to prevent problems with OR's #1871 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/associations/has_many_association.rb | 2 +- activerecord/lib/active_record/base.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record') 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 -- cgit v1.2.3