Merge pull request #15492 from sgrif/sg-dirty-defaults

Keep column defaults in type cast form

4 files changed, 12 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/column.rb b/activerecord/lib/active_record/connection_adapters/column.rb
index 34054589d0..3b0dcbc6a7 100644
--- a/activerecord/lib/active_record/connection_adapters/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/column.rb
@@ -52,7 +52,7 @@ module ActiveRecord
       end
 
       def extract_default(default)
-        type_cast_for_write(type_cast(default))
+        type_cast(default)
       end
     end
   end
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 1d75eeda69..4a6f062220 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -249,7 +249,7 @@ module ActiveRecord
     #   # Instantiates a single new object
     #   User.new(first_name: 'Jamie')
     def initialize(attributes = nil, options = {})
-      defaults = self.class.column_defaults.dup
+      defaults = self.class.raw_column_defaults.dup
       defaults.each { |k, v| defaults[k] = v.dup if v.duplicable? }
 
       @raw_attributes = defaults
diff --git a/activerecord/lib/active_record/model_schema.rb b/activerecord/lib/active_record/model_schema.rb
index f0ddf202c3..baf2b5fbf8 100644
--- a/activerecord/lib/active_record/model_schema.rb
+++ b/activerecord/lib/active_record/model_schema.rb
@@ -241,6 +241,14 @@ module ActiveRecord
         @column_defaults ||= Hash[columns.map { |c| [c.name, c.default] }]
       end
 
+      # Returns a hash where the keys are the column names and the values
+      # are the default values suitable for use in `@raw_attriubtes`
+      def raw_column_defaults # :nodoc:
+        @raw_column_defauts ||= Hash[column_defaults.map { |name, default|
+          [name, columns_hash[name].type_cast_for_write(default)]
+        }]
+      end
+
       # Returns an array of column names as strings.
       def column_names
         @column_names ||= columns.map { |column| column.name }
@@ -285,6 +293,7 @@ module ActiveRecord
 
         @arel_engine             = nil
         @column_defaults         = nil
+        @raw_column_defauts      = nil
         @column_names            = nil
         @column_types            = nil
         @content_columns         = nil
diff --git a/activerecord/lib/active_record/properties.rb b/activerecord/lib/active_record/properties.rb
index 5fd51e09fa..48ee42aaca 100644
--- a/activerecord/lib/active_record/properties.rb
+++ b/activerecord/lib/active_record/properties.rb
@@ -113,6 +113,7 @@ module ActiveRecord
         @columns_hash = nil
         @column_types = nil
         @column_defaults = nil
+        @raw_column_defaults = nil
         @column_names = nil
         @content_columns = nil
       end