Merge pull request #40151 from kamipo/return_time_after_save

Should not accidentally return decorated time object after `changes_applied`

activerecord/lib/active_record/type/time.rb

@@ -16,6 +16,16 @@ def serialize(value)
           value
         end
       end
+
+      private
+        def cast_value(value)
+          case value = super
+          when Value
+            value.__getobj__
+          else
+            value
+          end
+        end
     end
   end
 end

activerecord/test/cases/type/time_test.rb

@@ -11,11 +11,17 @@ def test_default_year_is_correct
         topic = Topic.new(bonus_time: { 4 => 10, 5 => 30 })
 
         assert_equal expected_time, topic.bonus_time
+        assert_instance_of ::Time, topic.bonus_time
 
         topic.save!
+
+        assert_equal expected_time, topic.bonus_time
+        assert_instance_of ::Time, topic.bonus_time
+
         topic.reload
 
         assert_equal expected_time, topic.bonus_time
+        assert_instance_of ::Time, topic.bonus_time
       end
     end
   end