3 files changed, 42 insertions, 3 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..e0bee8c17e
--- /dev/null
+++ b/activerecord/lib/active_record/attribute/user_provided_default.rb
@@ -0,0 +1,32 @@
+require 'active_record/attribute'
+
+module ActiveRecord
+  class Attribute # :nodoc:
+    class UserProvidedDefault < FromUser
+      def initialize(name, value, type, database_default)
+        super(name, value, type)
+        @database_default = database_default
+      end
+
+      def type_cast(value)
+        if value.is_a?(Proc)
+          super(value.call)
+        else
+          super
+        end
+      end
+
+      def changed_in_place_from?(old_value)
+        super || changed_from?(database_default.value)
+      end
+
+      def with_type(type)
+        self.class.new(name, value_before_type_cast, type, database_default)
+      end
+
+      protected
+
+      attr_reader :database_default
+    end
+  end
+end
diff --git a/activerecord/lib/active_record/attributes.rb b/activerecord/lib/active_record/attributes.rb
index 50339b6f69..c89099589e 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,12 @@ 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,
+            _default_attributes[name],
+          )
         else
           default_attribute = Attribute.from_database(name, value, type)
         end
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index 01c05462b2..dd8f0aa298 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -90,8 +90,8 @@ module ActiveRecord
           relation.preload! other.preload_values unless other.preload_values.empty?
           relation.includes! other.includes_values unless other.includes_values.empty?
         else
-          reflection = relation.klass.reflect_on_all_associations.find do |reflection|
-            reflection.class_name == other.klass.name
+          reflection = relation.klass.reflect_on_all_associations.find do |r|
+            r.class_name == other.klass.name
           end || return
 
           unless other.preload_values.empty?