Move changed_attributes into dirty.rb

Move serialization dirty into serialization.rb

2 files changed, 29 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb
index 19e81abba5..c10f400477 100644
--- a/activerecord/lib/active_record/attribute_methods/dirty.rb
+++ b/activerecord/lib/active_record/attribute_methods/dirty.rb
@@ -38,7 +38,27 @@ module ActiveRecord
         end
       end
 
+    def initialize_dup(other) # :nodoc:
+      super
+      init_changed_attributes
+    end
+
     private
+      def initialize_internals_callback
+        super
+        init_changed_attributes
+      end
+
+      def init_changed_attributes
+        @changed_attributes = nil
+        # Intentionally avoid using #column_defaults since overridden defaults (as is done in
+        # optimistic locking) won't get written unless they get marked as changed
+        self.class.columns.each do |c|
+          attr, orig_value = c.name, c.default
+          changed_attributes[attr] = orig_value if _field_changed?(attr, orig_value, @attributes[attr])
+        end
+      end
+
       # Wrap write_attribute to remember original attribute value.
       def write_attribute(attr, value)
         attr = attr.to_s
@@ -67,7 +87,7 @@ module ActiveRecord
       # Serialized attributes should always be written in case they've been
       # changed in place.
       def keys_for_partial_write
-        changed | (attributes.keys & self.class.serialized_attributes.keys)
+        changed
       end
 
       def _field_changed?(attr, old, value)
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index d484659190..3227464032 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -115,6 +115,14 @@ module ActiveRecord
           end
         end
 
+        def should_record_timestamps?
+          super || (self.record_timestamps && (attributes.keys & self.class.serialized_attributes.keys).present?)
+        end
+
+        def keys_for_partial_write
+          super | (attributes.keys & self.class.serialized_attributes.keys)
+        end
+
         def type_cast_attribute_for_write(column, value)
           if column && coder = self.class.serialized_attributes[column.name]
             Attribute.new(coder, value, :unserialized)