mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor InsertAll not to permanently lease a connection 

Extracted from: https://github.com/rails/rails/pull/50793
This commit is contained in:
Jean Boussier 2024-03-01 15:20:16 +01:00
parent 2bf0d68de6
commit ec7deca7ee
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activerecord/lib/active_record/insert_all.rb
View File

@ -7,8 +7,16 @@ module ActiveRecord
attr_reader :model, :connection, :inserts, :keys attr_reader :model, :connection, :inserts, :keys
attr_reader :on_duplicate, :update_only, :returning, :unique_by, :update_sql attr_reader :on_duplicate, :update_only, :returning, :unique_by, :update_sql
def initialize(model, inserts, on_duplicate:, update_only: nil, returning: nil, unique_by: nil, record_timestamps: nil) class << self
@model, @connection, @inserts = model, model.lease_connection, inserts.map(&:stringify_keys) def execute(model, ...)
model.with_connection do |c|
new(model, c, ...).execute
end
end
end
def initialize(model, connection, inserts, on_duplicate:, update_only: nil, returning: nil, unique_by: nil, record_timestamps: nil)
@model, @connection, @inserts = model, connection, inserts.map(&:stringify_keys)
@on_duplicate, @update_only, @returning, @unique_by = on_duplicate, update_only, returning, unique_by @on_duplicate, @update_only, @returning, @unique_by = on_duplicate, update_only, returning, unique_by
@record_timestamps = record_timestamps.nil? ? model.record_timestamps : record_timestamps @record_timestamps = record_timestamps.nil? ? model.record_timestamps : record_timestamps

6
activerecord/lib/active_record/persistence.rb
View File

@ -173,7 +173,7 @@ module ActiveRecord
# { id: 2, title: "Eloquent Ruby" } # { id: 2, title: "Eloquent Ruby" }
# ]) # ])
def insert_all(attributes, returning: nil, unique_by: nil, record_timestamps: nil) def insert_all(attributes, returning: nil, unique_by: nil, record_timestamps: nil)
InsertAll.new(self, attributes, on_duplicate: :skip, returning: returning, unique_by: unique_by, record_timestamps: record_timestamps).execute InsertAll.execute(self, attributes, on_duplicate: :skip, returning: returning, unique_by: unique_by, record_timestamps: record_timestamps)
end end
# Inserts a single record into the database in a single SQL INSERT # Inserts a single record into the database in a single SQL INSERT
@ -240,7 +240,7 @@ module ActiveRecord
# { id: 1, title: "Eloquent Ruby", author: "Russ" } # { id: 1, title: "Eloquent Ruby", author: "Russ" }
# ]) # ])
def insert_all!(attributes, returning: nil, record_timestamps: nil) def insert_all!(attributes, returning: nil, record_timestamps: nil)
InsertAll.new(self, attributes, on_duplicate: :raise, returning: returning, record_timestamps: record_timestamps).execute InsertAll.execute(self, attributes, on_duplicate: :raise, returning: returning, record_timestamps: record_timestamps)
end end
# Updates or inserts (upserts) a single record into the database in a # Updates or inserts (upserts) a single record into the database in a
@ -360,7 +360,7 @@ module ActiveRecord
# #
# Book.find_by(isbn: "1").title # => "Eloquent Ruby" # Book.find_by(isbn: "1").title # => "Eloquent Ruby"
def upsert_all(attributes, on_duplicate: :update, update_only: nil, returning: nil, unique_by: nil, record_timestamps: nil) def upsert_all(attributes, on_duplicate: :update, update_only: nil, returning: nil, unique_by: nil, record_timestamps: nil)
InsertAll.new(self, attributes, on_duplicate: on_duplicate, update_only: update_only, returning: returning, unique_by: unique_by, record_timestamps: record_timestamps).execute InsertAll.execute(self, attributes, on_duplicate: on_duplicate, update_only: update_only, returning: returning, unique_by: unique_by, record_timestamps: record_timestamps)
end end
# Given an attributes hash, +instantiate+ returns a new instance of # Given an attributes hash, +instantiate+ returns a new instance of