diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-09-24 23:58:13 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-09-24 23:58:13 +0000 |
| commit | 2a35baa0bb4312d95e1340074cce731afedecde0 (patch) | |
| tree | e37ca3db4692f54fb728ad4f5fea7a797d2ed5be /activerecord/lib/active_record/associations | |
| parent | caaf40d5358ae8a2b31949c2af2d94be1be73976 (diff) | |
| download | rails-2a35baa0bb4312d95e1340074cce731afedecde0.tar.gz rails-2a35baa0bb4312d95e1340074cce731afedecde0.tar.bz2 rails-2a35baa0bb4312d95e1340074cce731afedecde0.zip | |
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
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
1 files changed, 1 insertions, 1 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 |