Clear @cache_keys cache even when eager loading

Follow up to rails#41789.

Author: kamipo

activerecord/lib/active_record/relation.rb

@@ -467,11 +467,6 @@ def _exec_scope(*args, &block) # :nodoc:
     def update_all(updates)
       raise ArgumentError, "Empty list of attributes to change" if updates.blank?
 
-      if eager_loading?
-        relation = apply_join_dependency
-        return relation.update_all(updates)
-      end
-
       if updates.is_a?(Hash)
         if klass.locking_enabled? &&
             !updates.key?(klass.locking_column) &&
@@ -484,11 +479,10 @@ def update_all(updates)
         values = Arel.sql(klass.sanitize_sql_for_assignment(updates, table.name))
       end
 
-      source = arel.source.clone
-      source.left = table
+      arel = eager_loading? ? apply_join_dependency.arel : build_arel
+      arel.source.left = table
 
       stmt = arel.compile_update(values, table[primary_key])
-      stmt.table(source)
 
       klass.connection.update(stmt, "#{klass} Update All").tap { reset }
     end
@@ -607,16 +601,10 @@ def delete_all
         raise ActiveRecordError.new("delete_all doesn't support #{invalid_methods.join(', ')}")
       end
 
-      if eager_loading?
-        relation = apply_join_dependency
-        return relation.delete_all
-      end
-
-      source = arel.source.clone
-      source.left = table
+      arel = eager_loading? ? apply_join_dependency.arel : build_arel
+      arel.source.left = table
 
       stmt = arel.compile_delete(table[primary_key])
-      stmt.from(source)
 
       klass.connection.delete(stmt, "#{klass} Destroy").tap { reset }
     end

activerecord/lib/active_record/relation/query_methods.rb

@@ -1225,7 +1225,7 @@ def assert_mutability!
         raise ImmutableRelation if defined?(@arel) && @arel
       end
 
-      def build_arel(aliases)
+      def build_arel(aliases = nil)
         arel = Arel::SelectManager.new(table)
 
         build_joins(arel.join_sources, aliases)

activerecord/test/cases/collection_cache_key_test.rb

@@ -111,6 +111,15 @@ class CollectionCacheKeyTest < ActiveRecord::TestCase
       assert_not_equal cache_key, developers.cache_key
     end
 
+    test "update_all with includes will update cache_key" do
+      developers = Developer.includes(:projects).where("projects.name": "Active Record")
+      cache_key = developers.cache_key
+
+      developers.update_all(updated_at: Time.now.utc)
+
+      assert_not_equal cache_key, developers.cache_key
+    end
+
     test "delete_all will update cache_key" do
       developers = Developer.where(name: "David")
       cache_key = developers.cache_key
@@ -120,6 +129,15 @@ class CollectionCacheKeyTest < ActiveRecord::TestCase
       assert_not_equal cache_key, developers.cache_key
     end
 
+    test "delete_all with includes will update cache_key" do
+      developers = Developer.includes(:projects).where("projects.name": "Active Record")
+      cache_key = developers.cache_key
+
+      developers.delete_all
+
+      assert_not_equal cache_key, developers.cache_key
+    end
+
     test "destroy_all will update cache_key" do
       developers = Developer.where(name: "David")
       cache_key = developers.cache_key