1 files changed, 26 insertions, 21 deletions

diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index 7f38dda11e..99de16cd33 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -1,7 +1,18 @@
-require 'active_support/concern'
-require 'active_support/core_ext/class/attribute_accessors'
 
 module ActiveRecord
+  ActiveSupport.on_load(:active_record_config) do
+    mattr_accessor :primary_key_prefix_type, instance_accessor: false
+
+    mattr_accessor :table_name_prefix, instance_accessor: false
+    self.table_name_prefix = ""
+
+    mattr_accessor :table_name_suffix, instance_accessor: false
+    self.table_name_suffix = ""
+
+    mattr_accessor :pluralize_table_names, instance_accessor: false
+    self.pluralize_table_names = true
+  end
+
   module ModelSchema
     extend ActiveSupport::Concern
 
@@ -13,7 +24,7 @@ module ActiveRecord
       # the Product class will look for "productid" instead of "id" as the primary column. If the
       # latter is specified, the Product class will look for "product_id" instead of "id". Remember
       # that this is a global setting for all Active Records.
-      config_attribute :primary_key_prefix_type, :global => true
+      config_attribute :primary_key_prefix_type, global: true
 
       ##
       # :singleton-method:
@@ -26,14 +37,12 @@ module ActiveRecord
       # a namespace by defining a singleton method in the parent module called table_name_prefix which
       # returns your chosen prefix.
       config_attribute :table_name_prefix
-      self.table_name_prefix = ""
 
       ##
       # :singleton-method:
       # Works like +table_name_prefix+, but appends instead of prepends (set to "_basecamp" gives "projects_basecamp",
       # "people_basecamp"). By default, the suffix is the empty string.
       config_attribute :table_name_suffix
-      self.table_name_suffix = ""
 
       ##
       # :singleton-method:
@@ -41,7 +50,6 @@ module ActiveRecord
       # If true, the default table name for a Product class will be +products+. If false, it would just be +product+.
       # See table_name for the full rules on table/class naming. This is true, by default.
       config_attribute :pluralize_table_names
-      self.pluralize_table_names = true
     end
 
     module ClassMethods
@@ -135,16 +143,12 @@ module ActiveRecord
 
       # Computes the table name, (re)sets it internally, and returns it.
       def reset_table_name #:nodoc:
-        if abstract_class?
-          self.table_name = if active_record_super == Base || active_record_super.abstract_class?
-                              nil
-                            else
-                              active_record_super.table_name
-                            end
+        self.table_name = if abstract_class?
+          active_record_super == Base ? nil : active_record_super.table_name
         elsif active_record_super.abstract_class?
-          self.table_name = active_record_super.table_name || compute_table_name
+          active_record_super.table_name || compute_table_name
         else
-          self.table_name = compute_table_name
+          compute_table_name
         end
       end
 
@@ -221,7 +225,7 @@ module ActiveRecord
       def decorate_columns(columns_hash) # :nodoc:
         return if columns_hash.empty?
 
-        serialized_attributes.keys.each do |key|
+        serialized_attributes.each_key do |key|
           columns_hash[key] = AttributeMethods::Serialization::Type.new(columns_hash[key])
         end
 
@@ -255,13 +259,12 @@ module ActiveRecord
       # and true as the value. This makes it possible to do O(1) lookups in respond_to? to check if a given method for attribute
       # is available.
       def column_methods_hash #:nodoc:
-        @dynamic_methods_hash ||= column_names.inject(Hash.new(false)) do |methods, attr|
+        @dynamic_methods_hash ||= column_names.each_with_object(Hash.new(false)) do |attr, methods|
           attr_name = attr.to_s
           methods[attr.to_sym]       = attr_name
           methods["#{attr}=".to_sym] = attr_name
           methods["#{attr}?".to_sym] = attr_name
           methods["#{attr}_before_type_cast".to_sym] = attr_name
-          methods
         end
       end
 
@@ -308,8 +311,11 @@ module ActiveRecord
         @relation             = nil
       end
 
-      def clear_cache! # :nodoc:
-        connection.schema_cache.clear!
+      # This is a hook for use by modules that need to do extra stuff to
+      # attributes when they are initialized. (e.g. attribute
+      # serialization)
+      def initialize_attributes(attributes, options = {}) #:nodoc:
+        attributes
       end
 
       private
@@ -317,8 +323,7 @@ module ActiveRecord
       # Guesses the table name, but does not decorate it with prefix and suffix information.
       def undecorated_table_name(class_name = base_class.name)
         table_name = class_name.to_s.demodulize.underscore
-        table_name = table_name.pluralize if pluralize_table_names
-        table_name
+        pluralize_table_names ? table_name.pluralize : table_name
       end
 
       # Computes and returns a table name according to default conventions.