kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix before_type_cast for timezone aware attributes by caching converted value on write. Also remove read method reload arg on timezone attributes.

Browse source
This commit is contained in:
Adam Meehan 2011-03-01 22:18:46 +11:00 committed by Aaron Patterson
parent 54c963c89b
commit c5908a8649
2 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
View file

@ -21,9 +21,9 @@ module ActiveRecord
def define_method_attribute(attr_name) def define_method_attribute(attr_name)
if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name]) if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
method_body, line = <<-EOV, __LINE__ + 1 method_body, line = <<-EOV, __LINE__ + 1
def _#{attr_name}(reload = false) def _#{attr_name}
cached = @attributes_cache['#{attr_name}'] cached = @attributes_cache['#{attr_name}']
return cached if cached && !reload return cached if cached
time = _read_attribute('#{attr_name}') time = _read_attribute('#{attr_name}')
@attributes_cache['#{attr_name}'] = time.acts_like?(:time) ? time.in_time_zone : time @attributes_cache['#{attr_name}'] = time.acts_like?(:time) ? time.in_time_zone : time
end end
@ -41,12 +41,13 @@ module ActiveRecord
if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name]) if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
method_body, line = <<-EOV, __LINE__ + 1 method_body, line = <<-EOV, __LINE__ + 1
def #{attr_name}=(original_time) def #{attr_name}=(original_time)
time = original_time.dup unless original_time.nil? time = original_time
unless time.acts_like?(:time) unless time.acts_like?(:time)
time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time time = time.is_a?(String) ? Time.zone.parse(time) : time.to_time rescue time
end end
time = time.in_time_zone rescue nil if time time = time.in_time_zone rescue nil if time
write_attribute(:#{attr_name}, (time || original_time)) write_attribute(:#{attr_name}, original_time)
@attributes_cache["#{attr_name}"] = time
end end
EOV EOV
generated_attribute_methods.module_eval(method_body, __FILE__, line) generated_attribute_methods.module_eval(method_body, __FILE__, line)

26
activerecord/test/cases/attribute_methods_test.rb
View file

@ -118,22 +118,18 @@ class AttributeMethodsTest < ActiveRecord::TestCase
end end
def test_read_attributes_before_type_cast_on_datetime def test_read_attributes_before_type_cast_on_datetime
developer = Developer.find(:first) in_time_zone "Pacific Time (US & Canada)" do
if current_adapter?(:Mysql2Adapter, :OracleAdapter) record = @target.new
# Mysql2 and Oracle adapters keep the value in Time instance
assert_equal developer.created_at.to_s(:db), developer.attributes_before_type_cast["created_at"].to_s(:db) record.written_on = "345643456"
else assert_equal "345643456", record.written_on_before_type_cast
assert_equal developer.created_at.to_s(:db), developer.attributes_before_type_cast["created_at"].to_s assert_equal nil, record.written_on
record.written_on = "2009-10-11 12:13:14"
assert_equal "2009-10-11 12:13:14", record.written_on_before_type_cast
assert_equal Time.zone.parse("2009-10-11 12:13:14"), record.written_on
assert_equal ActiveSupport::TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
end end
developer.created_at = "345643456"
assert_equal developer.created_at_before_type_cast, "345643456"
assert_equal developer.created_at, nil
developer.created_at = "2010-03-21 21:23:32"
assert_equal developer.created_at_before_type_cast, "2010-03-21 21:23:32"
assert_equal developer.created_at, Time.parse("2010-03-21 21:23:32")
end end
def test_hash_content def test_hash_content