diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-01-01 00:21:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-01 00:21:25 +0100 |
commit | b23187cc097f0f7177e228c9a64e47c680f81f9b (patch) | |
tree | a0084a681b534ad82f61f7bb64bd2565daa217e3 /activerecord/lib | |
parent | e632c2fa4cb60072a778ce95c952a0fa95e5b074 (diff) | |
parent | 2b5dacb43dd92e98e1fd240a80c2a540ed380257 (diff) | |
download | rails-b23187cc097f0f7177e228c9a64e47c680f81f9b.tar.gz rails-b23187cc097f0f7177e228c9a64e47c680f81f9b.tar.bz2 rails-b23187cc097f0f7177e228c9a64e47c680f81f9b.zip |
Merge pull request #27531 from kamipo/string_timestamp_attributes
Change `timestamp_attributes_for_{create,update}` from symbol to string
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/timestamp.rb | 11 |
1 files changed, 5 insertions, 6 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 |