1 files changed, 49 insertions, 22 deletions

diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 89f6eccbd2..3f90d25962 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'thread'
 
 module ActiveRecord
   module Core
@@ -44,10 +45,10 @@ module ActiveRecord
 
       ##
       # :singleton-method:
-      # Determines whether to use Time.local (using :local) or Time.utc (using :utc) when pulling
-      # dates and times from the database. This is set to :local by default.
+      # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
+      # dates and times from the database. This is set to :utc by default.
       config_attribute :default_timezone, :global => true
-      self.default_timezone = :local
+      self.default_timezone = :utc
 
       ##
       # :singleton-method:
@@ -71,6 +72,16 @@ module ActiveRecord
       # The connection handler
       config_attribute :connection_handler
       self.connection_handler = ConnectionAdapters::ConnectionHandler.new
+
+      ##
+      # :singleton-method:
+      # Specifies wether or not has_many or has_one association option
+      # :dependent => :restrict raises an exception. If set to true, the
+      # ActiveRecord::DeleteRestrictionError exception will be raised
+      # along with a DEPRECATION WARNING. If set to false, an error would
+      # be added to the model instead.
+      config_attribute :dependent_restrict_raises, :global => true
+      self.dependent_restrict_raises = true
     end
 
     module ClassMethods
@@ -80,6 +91,8 @@ module ActiveRecord
       end
 
       def initialize_generated_modules
+        @attribute_methods_mutex = Mutex.new
+
         # force attribute methods to be higher in inheritance hierarchy than other generated methods
         generated_attribute_methods
         generated_feature_methods
@@ -152,16 +165,9 @@ module ActiveRecord
     #   User.new({ :first_name => 'Jamie', :is_admin => true }, :without_protection => true)
     def initialize(attributes = nil, options = {})
       @attributes = self.class.initialize_attributes(self.class.column_defaults.dup)
-      @association_cache = {}
-      @aggregation_cache = {}
-      @attributes_cache = {}
-      @new_record = true
-      @readonly = false
-      @destroyed = false
-      @marked_for_destruction = false
-      @previously_changed = {}
-      @changed_attributes = {}
-      @relation = nil
+      @columns_hash = self.class.column_types.dup
+
+      init_internals
 
       ensure_proper_type
 
@@ -185,13 +191,13 @@ module ActiveRecord
     #   post.title # => 'hello world'
     def init_with(coder)
       @attributes = self.class.initialize_attributes(coder['attributes'])
-      @relation = nil
+      @columns_hash = self.class.column_types.merge(coder['column_types'] || {})
+
+
+      init_internals
 
-      @attributes_cache, @previously_changed, @changed_attributes = {}, {}, {}
-      @association_cache = {}
-      @aggregation_cache = {}
-      @readonly = @destroyed = @marked_for_destruction = false
       @new_record = false
+
       run_callbacks :find
       run_callbacks :initialize
 
@@ -206,20 +212,24 @@ module ActiveRecord
     # The dup method does not preserve the timestamps (created|updated)_(at|on).
     def initialize_dup(other)
       cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast)
+      self.class.initialize_attributes(cloned_attributes)
+
       cloned_attributes.delete(self.class.primary_key)
 
       @attributes = cloned_attributes
+      @attributes[self.class.primary_key] = nil
 
-      _run_initialize_callbacks if _initialize_callbacks.any?
+      run_callbacks(:initialize) if _initialize_callbacks.any?
 
       @changed_attributes = {}
       self.class.column_defaults.each do |attr, orig_value|
-        @changed_attributes[attr] = orig_value if field_changed?(attr, orig_value, @attributes[attr])
+        @changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
       end
 
       @aggregation_cache = {}
       @association_cache = {}
-      @attributes_cache = {}
+      @attributes_cache  = {}
+
       @new_record  = true
 
       ensure_proper_type
@@ -238,7 +248,7 @@ module ActiveRecord
     #   end
     #   coder = {}
     #   Post.new.encode_with(coder)
-    #   coder # => { 'id' => nil, ... }
+    #   coder # => {"attributes" => {"id" => nil, ... }}
     def encode_with(coder)
       coder['attributes'] = attributes
     end
@@ -330,5 +340,22 @@ module ActiveRecord
     def to_ary # :nodoc:
       nil
     end
+
+    def init_internals
+      pk = self.class.primary_key
+
+      @attributes[pk] = nil unless @attributes.key?(pk)
+
+      @relation               = nil
+      @aggregation_cache      = {}
+      @association_cache      = {}
+      @attributes_cache       = {}
+      @previously_changed     = {}
+      @changed_attributes     = {}
+      @readonly               = false
+      @destroyed              = false
+      @marked_for_destruction = false
+      @new_record             = true
+    end
   end
 end