diff options
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb')
| -rw-r--r-- | activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb | 19 |
1 files changed, 16 insertions, 3 deletions
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 7cde9dbffd..d7972917fe 100644 --- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb +++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb @@ -19,12 +19,15 @@ module ActiveRecord # Defined for all +datetime+ and +timestamp+ attributes when +time_zone_aware_attributes+ are enabled. # This enhanced read method automatically converts the UTC time stored in the database to the time # zone stored in Time.zone. - def attribute_access_code(attr_name) - if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name]) + def internal_attribute_access_code(attr_name) + column = columns_hash[attr_name] + + if create_time_zone_conversion_attribute?(attr_name, column) <<-CODE cached = @attributes_cache['#{attr_name}'] return cached if cached - time = _read_attribute('#{attr_name}') + v = @attributes['#{attr_name}'] + time = #{column.type_cast_code('v')} @attributes_cache['#{attr_name}'] = time.acts_like?(:time) ? time.in_time_zone : time CODE else @@ -32,6 +35,16 @@ module ActiveRecord end end + def external_attribute_access_code(attr_name) + column = columns_hash[attr_name] + + if create_time_zone_conversion_attribute?(attr_name, column) + "attributes_cache[attr_name] ||= (#{attribute_cast_code(attr_name)})" + else + super + end + end + def attribute_cast_code(attr_name) if create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name]) "v.acts_like?(:time) ? v.in_time_zone : v" |