Merge branch 'master' into clear_all_environments_log_by_default

1 files changed, 12 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index ef629dcb3b..4e941cf2df 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -362,6 +362,9 @@ module ActiveRecord
     #
     #   # Update all books that match conditions, but limit it to 5 ordered by date
     #   Book.where('title LIKE ?', '%Rails%').order(:created_at).limit(5).update_all(author: 'David')
+    #
+    #   # Update all invoices and set the number column to its id value.
+    #   Invoice.update_all('number = id')
     def update_all(updates)
       raise ArgumentError, "Empty list of attributes to change" if updates.blank?
 
@@ -370,7 +373,7 @@ module ActiveRecord
       stmt.set Arel.sql(@klass.send(:sanitize_sql_for_assignment, updates))
       stmt.table(table)
 
-      if joins_values.any?
+      if has_join_values?
         @klass.connection.join_to_update(stmt, arel, arel_attribute(primary_key))
       else
         stmt.key = arel_attribute(primary_key)
@@ -519,7 +522,7 @@ module ActiveRecord
         stmt = Arel::DeleteManager.new
         stmt.from(table)
 
-        if joins_values.any?
+        if has_join_values?
           @klass.connection.join_to_delete(stmt, arel, arel_attribute(primary_key))
         else
           stmt.wheres = arel.constraints
@@ -677,13 +680,18 @@ module ActiveRecord
 
     private
 
+      def has_join_values?
+        joins_values.any? || left_outer_joins_values.any?
+      end
+
       def exec_queries(&block)
         @records = eager_loading? ? find_with_associations.freeze : @klass.find_by_sql(arel, bound_attributes, &block).freeze
 
         preload = preload_values
-        preload +=  includes_values unless eager_loading?
-        preloader = build_preloader
+        preload += includes_values unless eager_loading?
+        preloader = nil
         preload.each do |associations|
+          preloader ||= build_preloader
           preloader.preload @records, associations
         end