diff options
Diffstat (limited to 'activerecord/lib/active_record')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 81b492e65e..3ba1cb26d1 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1249,11 +1249,11 @@ module ActiveRecord #:nodoc: def add_conditions!(sql, conditions, scope = :auto) scope = scope(:find) if :auto == scope segments = [] - segments << sanitize_sql(scope[:conditions]) if scope && scope[:conditions] - segments << sanitize_sql(conditions) unless conditions.nil? + segments << sanitize_sql(scope[:conditions]) if scope && !scope[:conditions].blank? + segments << sanitize_sql(conditions) unless conditions.blank? segments << type_condition unless descends_from_active_record? segments.compact! - sql << "WHERE (#{segments.join(") AND (")}) " unless segments.empty? + sql << "WHERE (#{segments.join(") AND (")}) " unless segments.all?(&:blank?) end def type_condition |