From cfc7f602bfab90d78828f50961dbaa1daf64a352 Mon Sep 17 00:00:00 2001 From: Evan Arnold Date: Fri, 1 Jun 2012 12:09:33 -0700 Subject: [PATCH 1/2] Add failing test for 3.2.5 datetime attribute regression --- activerecord/test/cases/dirty_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/activerecord/test/cases/dirty_test.rb b/activerecord/test/cases/dirty_test.rb index 2650040a80225..46d485135f569 100644 --- a/activerecord/test/cases/dirty_test.rb +++ b/activerecord/test/cases/dirty_test.rb @@ -78,6 +78,17 @@ def test_time_attributes_changes_with_time_zone assert_equal old_created_on, pirate.created_on_was end end + + def test_setting_time_attributes_with_time_zone_field_to_itself_should_not_be_marked_as_a_change + in_time_zone 'Paris' do + target = Class.new(ActiveRecord::Base) + target.table_name = 'pirates' + + pirate = target.create + pirate.created_on = pirate.created_on + assert !pirate.created_on_changed? + end + end def test_time_attributes_changes_without_time_zone_by_skip in_time_zone 'Paris' do From 635032fe3ba3d189e9c62eadb6e604f22669414d Mon Sep 17 00:00:00 2001 From: kennyj Date: Mon, 4 Jun 2012 03:12:21 +0900 Subject: [PATCH 2/2] Fix #6591. If a field with timezone isn't changed, we don't call will_change!. --- .../active_record/attribute_methods/time_zone_conversion.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb index ac31b636db900..58a5d82e14c27 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -57,8 +57,9 @@ def #{attr_name}=(original_time) time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time end time = time.in_time_zone rescue nil if time + changed = read_attribute(:#{attr_name}) != time write_attribute(:#{attr_name}, original_time) - #{attr_name}_will_change! + #{attr_name}_will_change! if changed @attributes_cache["#{attr_name}"] = time end EOV