Merge branch 'master' into update_default_hsts_max_age

1 files changed, 3 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index 64f81ca582..842f407517 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -432,15 +432,12 @@ module ActiveRecord
       @attributes.accessed
     end
 
-    protected
-
-      def attribute_method?(attr_name) # :nodoc:
+    private
+      def attribute_method?(attr_name)
         # We check defined? because Syck calls respond_to? before actually calling initialize.
         defined?(@attributes) && @attributes.key?(attr_name)
       end
 
-    private
-
       def arel_attributes_with_values_for_create(attribute_names)
         arel_attributes_with_values(attributes_for_create(attribute_names))
       end
@@ -456,7 +453,7 @@ module ActiveRecord
         arel_table = self.class.arel_table
 
         attribute_names.each do |name|
-          attrs[arel_table[name]] = typecasted_attribute_value(name)
+          attrs[arel_table[name]] = _read_attribute(name)
         end
         attrs
       end
@@ -483,9 +480,5 @@ module ActiveRecord
       def pk_attribute?(name)
         name == self.class.primary_key
       end
-
-      def typecasted_attribute_value(name)
-        _read_attribute(name)
-      end
   end
 end