Merge pull request #18307 from brainopia/datetime_regression

Fully support datetime values in AR::Type::DateTime#type_cast_for_database

2 files changed, 13 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/type/date_time.rb b/activerecord/lib/active_record/type/date_time.rb
index 5f19608a33..0a737815bc 100644
--- a/activerecord/lib/active_record/type/date_time.rb
+++ b/activerecord/lib/active_record/type/date_time.rb
@@ -11,7 +11,11 @@ module ActiveRecord
         zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
 
         if value.acts_like?(:time)
-          value.send(zone_conversion_method)
+          if value.respond_to?(zone_conversion_method)
+            value.send(zone_conversion_method)
+          else
+            value
+          end
         else
           super
         end
diff --git a/activerecord/test/cases/date_time_test.rb b/activerecord/test/cases/date_time_test.rb
index c2ec92c40d..330232cee2 100644
--- a/activerecord/test/cases/date_time_test.rb
+++ b/activerecord/test/cases/date_time_test.rb
@@ -50,4 +50,12 @@ class DateTimeTest < ActiveRecord::TestCase
     topic.bonus_time = ''
     assert_nil topic.bonus_time
   end
+
+  def test_assign_in_local_timezone
+    now = DateTime.now
+    with_timezone_config default: :local do
+      task = Task.new starting: now
+      assert now, task.starting
+    end
+  end
 end