diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
| commit | 328ef3feaad4c110a7277e3432e9203c7fbbb9e2 (patch) | |
| tree | 30337b862f5752c5a2f76c123abf28d94140bc4c /activerecord/lib/active_record/base.rb | |
| parent | 311342d8e231f8429e270dce2b1bf4abeb7b4293 (diff) | |
| download | rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.gz rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.bz2 rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.zip | |
Parenthesize :conditions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 58f884595c..5d594c61a6 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -893,8 +893,8 @@ module ActiveRecord #:nodoc: condition_segments = [scope_constraints[:conditions]] condition_segments << sanitize_sql(conditions) unless conditions.nil? condition_segments << type_condition unless descends_from_active_record? - condition_segments.compact! - sql << "WHERE #{condition_segments.join(" AND ")} " unless condition_segments.empty? + condition_segments.compact! + sql << "WHERE (#{condition_segments.join(") AND (")}) " unless condition_segments.empty? end def type_condition |