Respect model.record_timestamps? in upsert_all

Typically, Active Record respects the record_timestamps config on models
when deciding to automatically set timestamp columns:

- {created,updated}_{at,on} are set on record creation
- updated_{at,on} are set on record update

Currently, the machinery for bulk insert/upsert only automatically sets
timestamps

- on update, regardless of record_timestamps config

It does not set any timestamps on record creation.

This teaches it how to set timestamps on creation, and respect
record_timestamp, so the behavior matches typical record operations.

Author: sambostock

activerecord/lib/active_record/insert_all.rb

@@ -12,6 +12,7 @@ def initialize(model, inserts, on_duplicate:, returning: nil, unique_by: nil)
 
       @model, @connection, @inserts, @keys = model, model.connection, inserts, inserts.first.keys.map(&:to_s)
       @on_duplicate, @returning, @unique_by = on_duplicate, returning, unique_by
+      @record_timestamps = model.record_timestamps
 
       disallow_raw_sql!(returning)
       disallow_raw_sql!(on_duplicate)
@@ -64,15 +65,29 @@ def map_key_with_value
       inserts.map do |attributes|
         attributes = attributes.stringify_keys
         attributes.merge!(scope_attributes) if scope_attributes
+        attributes.reverse_merge!(timestamps_for_create) if record_timestamps?
 
         verify_attributes(attributes)
 
-        keys.map do |key|
+        keys_including_timestamps.map do |key|
           yield key, attributes[key]
         end
       end
     end
 
+    def record_timestamps?
+      @record_timestamps
+    end
+
+    # TODO: Consider remaining this method, as it only conditionally extends keys, not always
+    def keys_including_timestamps
+      @keys_including_timestamps ||= if record_timestamps?
+        keys + model.all_timestamp_attributes_in_model
+      else
+        keys
+      end
+    end
+
     private
       attr_reader :scope_attributes
 
@@ -134,7 +149,7 @@ def unique_by_columns
 
 
       def verify_attributes(attributes)
-        if keys != attributes.keys.to_set
+        if keys_including_timestamps != attributes.keys.to_set
           raise ArgumentError, "All objects being inserted must have the same keys"
         end
       end
@@ -148,10 +163,14 @@ def disallow_raw_sql!(value)
                              "by wrapping them in Arel.sql()."
       end
 
+      def timestamps_for_create
+        model.all_timestamp_attributes_in_model.index_with(connection.high_precision_current_timestamp)
+      end
+
       class Builder # :nodoc:
         attr_reader :model
 
-        delegate :skip_duplicates?, :update_duplicates?, :keys, to: :insert_all
+        delegate :skip_duplicates?, :update_duplicates?, :keys, :keys_including_timestamps, :record_timestamps?, to: :insert_all
 
         def initialize(insert_all)
           @insert_all, @model, @connection = insert_all, insert_all.model, insert_all.connection
@@ -162,9 +181,10 @@ def into
         end
 
         def values_list
-          types = extract_types_from_columns_on(model.table_name, keys: keys)
+          types = extract_types_from_columns_on(model.table_name, keys: keys_including_timestamps)
 
           values_list = insert_all.map_key_with_value do |key, value|
+            next value if Arel::Nodes::SqlLiteral === value
             connection.with_yaml_fallback(types[key].serialize(value))
           end
 
@@ -196,7 +216,7 @@ def updatable_columns
         end
 
         def touch_model_timestamps_unless(&block)
-          return "" unless update_duplicates?
+          return "" unless update_duplicates? && record_timestamps?
 
           model.timestamp_attributes_for_update_in_model.filter_map do |column_name|
             if touch_timestamp_attribute?(column_name)
@@ -219,7 +239,7 @@ def touch_timestamp_attribute?(column_name)
           end
 
           def columns_list
-            format_columns(insert_all.keys)
+            format_columns(insert_all.keys_including_timestamps)
           end
 
           def extract_types_from_columns_on(table_name, keys:)

activerecord/test/cases/insert_all_test.rb

@@ -394,15 +394,15 @@ def test_upsert_all_uses_given_updated_on_over_implicit_updated_on
     assert_equal updated_on, Book.find(101).updated_on
   end
 
-  def test_upsert_all_does_not_implicitly_set_timestamps_on_create_even_when_model_record_timestamps_is_true
+  def test_upsert_all_implicitly_sets_timestamps_on_create_when_model_record_timestamps_is_true
     with_record_timestamps(Ship, true) do
       Ship.upsert_all [{ id: 101, name: "RSS Boaty McBoatface" }]
 
       ship = Ship.find(101)
-      assert_nil ship.created_at
-      assert_nil ship.created_on
-      assert_nil ship.updated_at
-      assert_nil ship.updated_on
+      assert_equal Time.new.year, ship.created_at.year
+      assert_equal Time.new.year, ship.created_on.year
+      assert_equal Time.new.year, ship.updated_at.year
+      assert_equal Time.new.year, ship.updated_on.year
     end
   end
 
@@ -434,7 +434,7 @@ def test_upsert_all_implicitly_sets_timestamps_on_update_when_model_record_times
     end
   end
 
-  def test_upsert_all_implicitly_sets_timestamps_on_update_even_when_model_record_timestamps_is_false
+  def test_upsert_all_does_not_implicitly_set_timestamps_on_update_when_model_record_timestamps_is_false
     skip unless supports_insert_on_duplicate_update?
 
     with_record_timestamps(Ship, false) do
@@ -445,8 +445,8 @@ def test_upsert_all_implicitly_sets_timestamps_on_update_even_when_model_record_
       ship = Ship.find(101)
       assert_nil ship.created_at
       assert_nil ship.created_on
-      assert_equal Time.now.year, ship.updated_at.year
-      assert_equal Time.now.year, ship.updated_on.year
+      assert_nil ship.updated_at
+      assert_nil ship.updated_on
     end
   end