DEV: Update DB.after_commit to be compatible with 'real' transactions (#11294)

Previously it matched the behavior of standard ActiveRecord after_commit callbacks. They do not work well within `joinable: false` nested transactions. Now `DB.after_commit` callbacks will only be run when the outermost transaction has been committed.

Tests always run inside transactions, so this also introduces some logic to run callbacks once the test-wrapping transaction is reached.
This commit is contained in:
David Taylor
2020-12-08 00:03:31 +00:00
committed by GitHub
parent 76b04afca3
commit ed91385c18
3 changed files with 51 additions and 21 deletions

View File

@@ -5,27 +5,38 @@ require 'rails_helper'
describe MiniSqlMultisiteConnection do
describe "after_commit" do
it "runs callbacks after outermost transaction is committed" do
it "works for 'fake' (joinable) transactions" do
outputString = "1"
# Main transaction
ActiveRecord::Base.transaction do
outputString += "2"
DB.exec("SELECT 1")
ActiveRecord::Base.transaction do
DB.exec("SELECT 2")
outputString += "3"
DB.after_commit { outputString += "6" }
outputString += "4"
end
DB.after_commit { outputString += "7" }
outputString += "5"
end
# Nested transaction
ActiveRecord::Base.transaction do
expect(outputString).to eq("1234567")
end
it "works for real (non-joinable) transactions" do
outputString = "1"
ActiveRecord::Base.transaction(requires_new: true, joinable: false) do
outputString += "2"
DB.exec("SELECT 1")
ActiveRecord::Base.transaction(requires_new: true) do
DB.exec("SELECT 2")
outputString += "3"
DB.after_commit do
outputString += "6"
end
outputString += "4"
DB.after_commit { outputString += "6" }
outputString += "4"
end
DB.after_commit do
outputString += "7"
end
DB.after_commit { outputString += "7" }
outputString += "5"
end