diff options
author | gbuesing <gbuesing@gmail.com> | 2008-05-08 20:31:54 -0500 |
---|---|---|
committer | gbuesing <gbuesing@gmail.com> | 2008-05-08 20:31:54 -0500 |
commit | 328fada610aa9128386bc4b372d3e0b68aede945 (patch) | |
tree | 2499b812446d42b2a15de1b5f152771c27db445d /activerecord | |
parent | eb5b93be74ed3eca925c1ab9bd4739919ae39a41 (diff) | |
download | rails-328fada610aa9128386bc4b372d3e0b68aede945.tar.gz rails-328fada610aa9128386bc4b372d3e0b68aede945.tar.bz2 rails-328fada610aa9128386bc4b372d3e0b68aede945.zip |
ActiveRecord time zone aware attributes: blank string is treated as nil when assigned to writer
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods.rb | 6 | ||||
-rwxr-xr-x | activerecord/test/cases/attribute_methods_test.rb | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb index 973b761546..fde98bf19f 100644 --- a/activerecord/lib/active_record/attribute_methods.rb +++ b/activerecord/lib/active_record/attribute_methods.rb @@ -179,10 +179,10 @@ module ActiveRecord def define_write_method_for_time_zone_conversion(attr_name) method_body = <<-EOV def #{attr_name}=(time) - if time - time = Time.zone.parse(time) rescue time unless time.acts_like?(:time) - time = time.in_time_zone if time.acts_like?(:time) + unless time.blank? || time.acts_like?(: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 write_attribute(:#{attr_name}, time) end EOV diff --git a/activerecord/test/cases/attribute_methods_test.rb b/activerecord/test/cases/attribute_methods_test.rb index ab9abf27f9..c336fd9afb 100755 --- a/activerecord/test/cases/attribute_methods_test.rb +++ b/activerecord/test/cases/attribute_methods_test.rb @@ -186,6 +186,14 @@ class AttributeMethodsTest < ActiveRecord::TestCase end end end + + def test_setting_time_zone_aware_attribute_to_blank_string_returns_nil + in_time_zone "Pacific Time (US & Canada)" do + record = @target.new + record.written_on = ' ' + assert_nil record.written_on + end + end def test_setting_time_zone_aware_attribute_interprets_time_zone_unaware_string_in_time_zone time_string = 'Tue Jan 01 00:00:00 2008' |