Skip to content

Commit 0c779df

Browse files
committed
InsertAll fixes
Refactoring required after rails/rails@ec032b1
1 parent 940c49d commit 0c779df

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@ def merge_insert_values_list(insert:, insert_all:)
208208
connection = insert.send(:connection)
209209
identity_index = 0
210210

211-
types = insert.send(:extract_types_from_columns_on, insert.model.table_name, keys: insert.keys_including_timestamps)
211+
types = insert.send(:extract_types_for, insert.keys_including_timestamps)
212212

213213
values_list = insert_all.map_key_with_value do |key, value|
214214
if Arel::Nodes::SqlLiteral === value
215215
value
216216
elsif insert.primary_keys.include?(key) && value.nil?
217-
column = insert.send(:column_from_key, key)
217+
column = insert.model.columns_hash[key]
218218

219219
if column.is_identity?
220220
identity_index += 1

0 commit comments

Comments
 (0)