diff options
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 |