Remove some unnecessary code etc

1 files changed, 3 insertions, 19 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 d7972917fe..236681096b 100644
--- a/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
+++ b/activerecord/lib/active_record/attribute_methods/time_zone_conversion.rb
@@ -19,27 +19,11 @@ 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 internal_attribute_access_code(attr_name)
+          def internal_attribute_access_code(attr_name, cast_code)
             column = columns_hash[attr_name]
 
             if create_time_zone_conversion_attribute?(attr_name, column)
-              <<-CODE
-                cached = @attributes_cache['#{attr_name}']
-                return cached if cached
-                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
-              super
-            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)})"
+              super(attr_name, "(v=#{column.type_cast_code('v')}) && #{cast_code}")
             else
               super
             end
@@ -47,7 +31,7 @@ module ActiveRecord
 
           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"
+              "(v.acts_like?(:time) ? v.in_time_zone : v)"
             else
               super
             end