aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/timestamp.rb26
-rw-r--r--activerecord/test/cases/timestamp_test.rb25
2 files changed, 8 insertions, 43 deletions
diff --git a/activerecord/lib/active_record/timestamp.rb b/activerecord/lib/active_record/timestamp.rb
index cd13ea0d09..da075dabd3 100644
--- a/activerecord/lib/active_record/timestamp.rb
+++ b/activerecord/lib/active_record/timestamp.rb
@@ -18,8 +18,9 @@ module ActiveRecord
self.record_timestamps = true
end
- # Updates only the record's updated_at/on attributes to the current time without checking validations.
- # If an attribute name is passed, that attribute is used instead of the updated_at/on attributes.
+ # Saves the record with the updated_at/on attributes set to the current time.
+ # If the save fails because of validation errors, an ActiveRecord::RecordInvalid exception is raised.
+ # If an attribute name is passed, that attribute is used for the touch instead of the updated_at/on attributes.
#
# Examples:
#
@@ -29,24 +30,13 @@ module ActiveRecord
current_time = current_time_from_proper_timezone
if attribute
- update_attribute(attribute, current_time)
+ write_attribute(attribute, current_time)
else
- update_attribute('updated_at', current_time) if respond_to?(:updated_at)
- update_attribute('updated_on', current_time) if respond_to?(:updated_on)
+ write_attribute('updated_at', current_time) if respond_to?(:updated_at)
+ write_attribute('updated_on', current_time) if respond_to?(:updated_on)
end
- end
-
- # Saves the entire record with the updated_at/on attributes set to the current time.
- # If the save fails because of validation errors, an ActiveRecord::RecordInvalid exception is raised.
- # If an attribute name is passed, that attribute is used for the touch instead of the updated_at/on attributes.
- #
- # Examples:
- #
- # product.touch! # updates updated_at
- # product.touch!(:designed_at) # updates the designed_at attribute
- def touch!(attribute = nil)
- raise ActiveRecord::RecordInvalid.new(self) unless valid?
- touch(attribute)
+
+ save!
end
diff --git a/activerecord/test/cases/timestamp_test.rb b/activerecord/test/cases/timestamp_test.rb
index 6c3596347d..24b237a72b 100644
--- a/activerecord/test/cases/timestamp_test.rb
+++ b/activerecord/test/cases/timestamp_test.rb
@@ -30,24 +30,6 @@ class TimestampTest < ActiveRecord::TestCase
assert @previously_updated_at != @developer.updated_at
end
- def test_touching_a_record_updates_its_timestamp_even_if_object_instance_is_invalid
- @developer.name = nil
- @developer.touch
-
- assert @previously_updated_at != @developer.updated_at
- end
-
- def test_touch_bang_a_record_updates_its_timestamp
- @developer.touch!
-
- assert @previously_updated_at != @developer.updated_at
- end
-
- def test_touch_banging_a_record_fails_if_object_instance_is_invalid
- @developer.name = nil
- assert_raise(ActiveRecord::RecordInvalid) { @developer.touch! }
- end
-
def test_touching_a_different_attribute
previously_created_at = @developer.created_at
@developer.touch(:created_at)
@@ -55,13 +37,6 @@ class TimestampTest < ActiveRecord::TestCase
assert previously_created_at != @developer.created_at
end
- def test_touch_banging_a_different_attribute
- previously_created_at = @developer.created_at
- @developer.touch!(:created_at)
-
- assert previously_created_at != @developer.created_at
- end
-
def test_saving_a_record_with_a_belongs_to_that_specifies_touching_the_parent_should_update_the_parent_updated_at
pet = Pet.first
owner = pet.owner