Remove some unnecessary code etc

2 files changed, 11 insertions, 26 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index 2fe9968faf..245abeda65 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -49,8 +49,9 @@ module ActiveRecord
           # The second, slower, branch is necessary to support instances where the database
           # returns columns with extra stuff in (like 'my_column(omg)').
           def define_method_attribute(attr_name)
-            internal = internal_attribute_access_code(attr_name)
-            external = external_attribute_access_code(attr_name)
+            cast_code = attribute_cast_code(attr_name)
+            internal  = internal_attribute_access_code(attr_name, cast_code)
+            external  = external_attribute_access_code(attr_name, cast_code)
 
             if attr_name =~ ActiveModel::AttributeMethods::NAME_COMPILABLE_REGEXP
               generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
@@ -80,10 +81,10 @@ module ActiveRecord
             attribute_types_cached_by_default.include?(column.type)
           end
 
-          def internal_attribute_access_code(attr_name)
-            access_code = "(v=@attributes['#{attr_name}']) && #{attribute_cast_code(attr_name)}"
+          def internal_attribute_access_code(attr_name, cast_code)
+            access_code = "(v=@attributes['#{attr_name}']) && #{cast_code}"
 
-            unless attr_name == self.primary_key
+            unless attr_name == primary_key
               access_code.insert(0, "missing_attribute('#{attr_name}', caller) unless @attributes.has_key?('#{attr_name}'); ")
             end
 
@@ -94,8 +95,8 @@ module ActiveRecord
             access_code
           end
 
-          def external_attribute_access_code(attr_name)
-            access_code = "v && #{attribute_cast_code(attr_name)}"
+          def external_attribute_access_code(attr_name, cast_code)
+            access_code = "v && #{cast_code}"
 
             if cache_attribute?(attr_name)
               access_code = "attributes_cache[attr_name] ||= (#{access_code})"
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