2 files changed, 26 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/attribute/user_provided_default.rb b/activerecord/lib/active_record/attribute/user_provided_default.rb
new file mode 100644
index 0000000000..29d37ac689
--- /dev/null
+++ b/activerecord/lib/active_record/attribute/user_provided_default.rb
@@ -0,0 +1,19 @@
+require 'active_record/attribute'
+
+module ActiveRecord
+  class Attribute # :nodoc:
+    class UserProvidedDefault < FromUser
+      def initialize(name, value, type)
+        super(name, value, type)
+      end
+
+      def type_cast(value)
+        if value.is_a?(Proc)
+          super(value.call)
+        else
+          super
+        end
+      end
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/attributes.rb b/activerecord/lib/active_record/attributes.rb
index 50339b6f69..e574aebd6c 100644
--- a/activerecord/lib/active_record/attributes.rb
+++ b/activerecord/lib/active_record/attributes.rb
@@ -1,3 +1,5 @@
+require 'active_record/attribute/user_provided_default'
+
 module ActiveRecord
   # See ActiveRecord::Attributes::ClassMethods for documentation
   module Attributes
@@ -236,7 +238,11 @@ module ActiveRecord
         if value == NO_DEFAULT_PROVIDED
           default_attribute = _default_attributes[name].with_type(type)
         elsif from_user
-          default_attribute = Attribute.from_user(name, value, type)
+          default_attribute = Attribute::UserProvidedDefault.new(
+            name,
+            value,
+            type,
+          )
         else
           default_attribute = Attribute.from_database(name, value, type)
         end