Refactor building the update manager

1 files changed, 6 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 565ece1930..15fd1a58c8 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -216,17 +216,18 @@ module ActiveRecord
       if conditions || options.present?
         where(conditions).apply_finder_options(options.slice(:limit, :order)).update_all(updates)
       else
-        stmt = arel.compile_update(Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates)))
+        stmt = Arel::UpdateManager.new(arel.engine)
+
+        stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates))
+        stmt.table(table)
         stmt.key = table[primary_key]
 
         if joins_values.any?
           @klass.connection.join_to_update(stmt, arel)
         else
-          if limit = arel.limit
-            stmt.take limit
-          end
-
+          stmt.take(arel.limit)
           stmt.order(*arel.orders)
+          stmt.wheres = arel.constraints
         end
 
         @klass.connection.update stmt, 'SQL', bind_values