Remove construct_conditions

1 files changed, 2 insertions, 11 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 4bacf2390b..19a80a335e 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -871,10 +871,8 @@ module ActiveRecord #:nodoc:
       def update_all(updates, conditions = nil, options = {})
         relation = active_relation
 
-        if conditions = construct_conditions(conditions, nil)
-          relation = relation.where(Arel::SqlLiteral.new(conditions))
-        end
-
+        relation = relation.where(conditions) if conditions
+        relation = relation.where(type_condition) if finder_needs_type_condition?
         relation = relation.limit(options[:limit]) if options[:limit].present?
         relation = relation.order(options[:order]) if options[:order].present?
 
@@ -1635,13 +1633,6 @@ module ActiveRecord #:nodoc:
           offset
         end
 
-        def construct_conditions(conditions, scope)
-          conditions = [conditions]
-          conditions << scope[:conditions] if scope
-          conditions << type_condition if finder_needs_type_condition?
-          merge_conditions(*conditions)
-        end
-
         # Merges includes so that the result is a valid +include+
         def merge_includes(first, second)
          (Array.wrap(first) + Array.wrap(second)).uniq