Merge pull request #27531 from kamipo/string_timestamp_attributes

Change `timestamp_attributes_for_{create,update}` from symbol to string

2 files changed, 11 insertions, 12 deletions

diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index 63100e38a1..030fc35e2f 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveRecord
   # = Active Record \Timestamp
   #
@@ -58,7 +59,6 @@ module ActiveRecord
         current_time = current_time_from_proper_timezone
 
         all_timestamp_attributes.each do |column|
-          column = column.to_s
           if has_attribute?(column) && !attribute_present?(column)
             write_attribute(column, current_time)
           end
@@ -73,7 +73,6 @@ module ActiveRecord
         current_time = current_time_from_proper_timezone
 
         timestamp_attributes_for_update_in_model.each do |column|
-          column = column.to_s
           next if will_save_change_to_attribute?(column)
           write_attribute(column, current_time)
         end
@@ -86,11 +85,11 @@ module ActiveRecord
     end
 
     def timestamp_attributes_for_create_in_model
-      timestamp_attributes_for_create.select { |c| self.class.column_names.include?(c.to_s) }
+      timestamp_attributes_for_create.select { |c| self.class.column_names.include?(c) }
     end
 
     def timestamp_attributes_for_update_in_model
-      timestamp_attributes_for_update.select { |c| self.class.column_names.include?(c.to_s) }
+      timestamp_attributes_for_update.select { |c| self.class.column_names.include?(c) }
     end
 
     def all_timestamp_attributes_in_model
@@ -98,11 +97,11 @@ module ActiveRecord
     end
 
     def timestamp_attributes_for_update
-      [:updated_at, :updated_on]
+      ["updated_at", "updated_on"]
     end
 
     def timestamp_attributes_for_create
-      [:created_at, :created_on]
+      ["created_at", "created_on"]
     end
 
     def all_timestamp_attributes
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index cd83518e84..7327926706 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -432,32 +432,32 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_timestamp_attributes_for_create
     toy = Toy.first
-    assert_equal [:created_at, :created_on], toy.send(:timestamp_attributes_for_create)
+    assert_equal ["created_at", "created_on"], toy.send(:timestamp_attributes_for_create)
   end
 
   def test_timestamp_attributes_for_update
     toy = Toy.first
-    assert_equal [:updated_at, :updated_on], toy.send(:timestamp_attributes_for_update)
+    assert_equal ["updated_at", "updated_on"], toy.send(:timestamp_attributes_for_update)
   end
 
   def test_all_timestamp_attributes
     toy = Toy.first
-    assert_equal [:created_at, :created_on, :updated_at, :updated_on], toy.send(:all_timestamp_attributes)
+    assert_equal ["created_at", "created_on", "updated_at", "updated_on"], toy.send(:all_timestamp_attributes)
   end
 
   def test_timestamp_attributes_for_create_in_model
     toy = Toy.first
-    assert_equal [:created_at], toy.send(:timestamp_attributes_for_create_in_model)
+    assert_equal ["created_at"], toy.send(:timestamp_attributes_for_create_in_model)
   end
 
   def test_timestamp_attributes_for_update_in_model
     toy = Toy.first
-    assert_equal [:updated_at], toy.send(:timestamp_attributes_for_update_in_model)
+    assert_equal ["updated_at"], toy.send(:timestamp_attributes_for_update_in_model)
   end
 
   def test_all_timestamp_attributes_in_model
     toy = Toy.first
-    assert_equal [:created_at, :updated_at], toy.send(:all_timestamp_attributes_in_model)
+    assert_equal ["created_at", "updated_at"], toy.send(:all_timestamp_attributes_in_model)
   end
 
   def test_index_is_created_for_both_timestamps