Revert unused code and re-using query annotation for `update_all` and `delete_all`

This partly reverts #35617.

#35617 includes unused code (for `InsertStatement`) and re-using query
annotation for `update_all` and `delete_all`, which has not been
discussed yet.

If a relation has any annotation, I think it is mostly for SELECT query,
so re-using annotation by default is not always desired behavior for me.

We should discuss about desired behavior before publishing the
implementation.

5 files changed, 0 insertions, 66 deletions

diff --git a/activerecord/test/cases/arel/delete_manager_test.rb b/activerecord/test/cases/arel/delete_manager_test.rb
index 63cd1bffe3..0bad02f4d2 100644
--- a/activerecord/test/cases/arel/delete_manager_test.rb
+++ b/activerecord/test/cases/arel/delete_manager_test.rb
@@ -49,23 +49,5 @@ module Arel
         dm.where(table[:id].eq(10)).must_equal dm
       end
     end
-
-    describe "comment" do
-      it "chains" do
-        manager = Arel::DeleteManager.new
-        manager.comment("deleting").must_equal manager
-      end
-
-      it "appends a comment to the generated query" do
-        table = Table.new(:users)
-        dm = Arel::DeleteManager.new
-        dm.from table
-        dm.comment("deletion")
-        assert_match(%r{DELETE FROM "users" /\* deletion \*/}, dm.to_sql)
-
-        dm.comment("deletion", "with", "comment")
-        assert_match(%r{DELETE FROM "users" /\* deletion \*/ /\* with \*/ /\* comment \*/}, dm.to_sql)
-      end
-    end
   end
 end
diff --git a/activerecord/test/cases/arel/nodes/delete_statement_test.rb b/activerecord/test/cases/arel/nodes/delete_statement_test.rb
index 8ba268653d..3f078063a4 100644
--- a/activerecord/test/cases/arel/nodes/delete_statement_test.rb
+++ b/activerecord/test/cases/arel/nodes/delete_statement_test.rb
@@ -18,10 +18,8 @@ describe Arel::Nodes::DeleteStatement do
     it "is equal with equal ivars" do
       statement1 = Arel::Nodes::DeleteStatement.new
       statement1.wheres = %w[a b c]
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::DeleteStatement.new
       statement2.wheres = %w[a b c]
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
       array = [statement1, statement2]
       assert_equal 1, array.uniq.size
     end
@@ -29,14 +27,8 @@ describe Arel::Nodes::DeleteStatement do
     it "is not equal with different ivars" do
       statement1 = Arel::Nodes::DeleteStatement.new
       statement1.wheres = %w[a b c]
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::DeleteStatement.new
       statement2.wheres = %w[1 2 3]
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
-      array = [statement1, statement2]
-      assert_equal 2, array.uniq.size
-      statement2.wheres = %w[a b c]
-      statement2.comment = Arel::Nodes::Comment.new(["other"])
       array = [statement1, statement2]
       assert_equal 2, array.uniq.size
     end
diff --git a/activerecord/test/cases/arel/nodes/insert_statement_test.rb b/activerecord/test/cases/arel/nodes/insert_statement_test.rb
index 036576b231..252a0d0d0b 100644
--- a/activerecord/test/cases/arel/nodes/insert_statement_test.rb
+++ b/activerecord/test/cases/arel/nodes/insert_statement_test.rb
@@ -23,11 +23,9 @@ describe Arel::Nodes::InsertStatement do
       statement1 = Arel::Nodes::InsertStatement.new
       statement1.columns = %w[a b c]
       statement1.values  = %w[x y z]
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::InsertStatement.new
       statement2.columns = %w[a b c]
       statement2.values  = %w[x y z]
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
       array = [statement1, statement2]
       assert_equal 1, array.uniq.size
     end
@@ -36,15 +34,9 @@ describe Arel::Nodes::InsertStatement do
       statement1 = Arel::Nodes::InsertStatement.new
       statement1.columns = %w[a b c]
       statement1.values  = %w[x y z]
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::InsertStatement.new
       statement2.columns = %w[a b c]
       statement2.values  = %w[1 2 3]
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
-      array = [statement1, statement2]
-      assert_equal 2, array.uniq.size
-      statement2.values  = %w[x y z]
-      statement2.comment = Arel::Nodes::Comment.new("other")
       array = [statement1, statement2]
       assert_equal 2, array.uniq.size
     end
diff --git a/activerecord/test/cases/arel/nodes/update_statement_test.rb b/activerecord/test/cases/arel/nodes/update_statement_test.rb
index f133ddf7eb..a83ce32f68 100644
--- a/activerecord/test/cases/arel/nodes/update_statement_test.rb
+++ b/activerecord/test/cases/arel/nodes/update_statement_test.rb
@@ -27,7 +27,6 @@ describe Arel::Nodes::UpdateStatement do
       statement1.orders   = %w[x y z]
       statement1.limit    = 42
       statement1.key      = "zomg"
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::UpdateStatement.new
       statement2.relation = "zomg"
       statement2.wheres   = 2
@@ -35,7 +34,6 @@ describe Arel::Nodes::UpdateStatement do
       statement2.orders   = %w[x y z]
       statement2.limit    = 42
       statement2.key      = "zomg"
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
       array = [statement1, statement2]
       assert_equal 1, array.uniq.size
     end
@@ -48,7 +46,6 @@ describe Arel::Nodes::UpdateStatement do
       statement1.orders   = %w[x y z]
       statement1.limit    = 42
       statement1.key      = "zomg"
-      statement1.comment = Arel::Nodes::Comment.new(["comment"])
       statement2 = Arel::Nodes::UpdateStatement.new
       statement2.relation = "zomg"
       statement2.wheres   = 2
@@ -56,11 +53,6 @@ describe Arel::Nodes::UpdateStatement do
       statement2.orders   = %w[x y z]
       statement2.limit    = 42
       statement2.key      = "wth"
-      statement2.comment = Arel::Nodes::Comment.new(["comment"])
-      array = [statement1, statement2]
-      assert_equal 2, array.uniq.size
-      statement2.key      = "zomg"
-      statement2.comment  = Arel::Nodes::Comment.new(["other"])
       array = [statement1, statement2]
       assert_equal 2, array.uniq.size
     end
diff --git a/activerecord/test/cases/arel/update_manager_test.rb b/activerecord/test/cases/arel/update_manager_test.rb
index e13cb6aa52..cc1b9ac5b3 100644
--- a/activerecord/test/cases/arel/update_manager_test.rb
+++ b/activerecord/test/cases/arel/update_manager_test.rb
@@ -122,29 +122,5 @@ module Arel
         @um.key.must_equal @table[:foo]
       end
     end
-
-    describe "comment" do
-      it "chains" do
-        manager = Arel::UpdateManager.new
-        manager.comment("updating").must_equal manager
-      end
-
-      it "appends a comment to the generated query" do
-        table   = Table.new :users
-
-        manager = Arel::UpdateManager.new
-        manager.table table
-
-        manager.comment("updating")
-        manager.to_sql.must_be_like %{
-          UPDATE "users" /* updating */
-        }
-
-        manager.comment("updating", "with", "comment")
-        manager.to_sql.must_be_like %{
-          UPDATE "users" /* updating */ /* with */ /* comment */
-        }
-      end
-    end
   end
 end