github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Changed behavior of touch and added touch! Originally implemented by Obie Fernandez, updated touch! to act as a thin wrapper to touch. [#2520 state:resolved]"

Browse Source 
This reverts commit 3a875e6184.
This commit is contained in:
Pratik Naik
2010-03-27 08:22:32 +00:00
parent 62937b8fb0
commit 68ade93cde
2 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
activerecord/lib/active_record/timestamp.rb
View File

@@ -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

25
activerecord/test/cases/timestamp_test.rb
View File

@@ -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