Commit 1535041b authored by Adam Hegyi's avatar Adam Hegyi

Add reverse lock order option to FK removal

This change adds the reverse_lock_order attribute to the
`remove_foreign_key_if_exists` migration helper.
parent 5a5cc407
...@@ -1054,9 +1054,18 @@ module Gitlab ...@@ -1054,9 +1054,18 @@ module Gitlab
Arel::Nodes::SqlLiteral.new(replace.to_sql) Arel::Nodes::SqlLiteral.new(replace.to_sql)
end end
def remove_foreign_key_if_exists(...) def remove_foreign_key_if_exists(source, target = nil, **kwargs)
if foreign_key_exists?(...) reverse_lock_order = kwargs.delete(:reverse_lock_order)
remove_foreign_key(...) return unless foreign_key_exists?(source, target, **kwargs)
if target && reverse_lock_order && transaction_open?
execute("LOCK TABLE #{target}, #{source} IN ACCESS EXCLUSIVE MODE")
end
if target
remove_foreign_key(source, target, **kwargs)
else
remove_foreign_key(source, **kwargs)
end end
end end
......
...@@ -442,6 +442,60 @@ RSpec.describe Gitlab::Database::MigrationHelpers do ...@@ -442,6 +442,60 @@ RSpec.describe Gitlab::Database::MigrationHelpers do
end end
end end
describe '#remove_foreign_key_if_exists' do
context 'when the foreign key does not exist' do
before do
allow(model).to receive(:foreign_key_exists?).and_return(false)
end
it 'does nothing' do
expect(model).not_to receive(:remove_foreign_key)
model.remove_foreign_key_if_exists(:projects, :users, column: :user_id)
end
end
context 'when the foreign key exists' do
before do
allow(model).to receive(:foreign_key_exists?).and_return(true)
end
it 'removes the foreign key' do
expect(model).to receive(:remove_foreign_key).with(:projects, :users, { column: :user_id })
model.remove_foreign_key_if_exists(:projects, :users, column: :user_id)
end
context 'when the target table is not given' do
it 'passes the options as the second parameter' do
expect(model).to receive(:remove_foreign_key).with(:projects, { column: :user_id })
model.remove_foreign_key_if_exists(:projects, column: :user_id)
end
end
context 'when the reverse_lock_order option is given' do
it 'requests for lock before removing the foreign key' do
expect(model).to receive(:transaction_open?).and_return(true)
expect(model).to receive(:execute).with(/LOCK TABLE users, projects/)
expect(model).not_to receive(:remove_foreign_key).with(:projects, :users)
model.remove_foreign_key_if_exists(:projects, :users, column: :user_id, reverse_lock_order: true)
end
context 'when not inside a transaction' do
it 'does not lock' do
expect(model).to receive(:transaction_open?).and_return(false)
expect(model).not_to receive(:execute).with(/LOCK TABLE users, projects/)
expect(model).to receive(:remove_foreign_key).with(:projects, :users, { column: :user_id })
model.remove_foreign_key_if_exists(:projects, :users, column: :user_id, reverse_lock_order: true)
end
end
end
end
end
describe '#add_concurrent_foreign_key' do describe '#add_concurrent_foreign_key' do
before do before do
allow(model).to receive(:foreign_key_exists?).and_return(false) allow(model).to receive(:foreign_key_exists?).and_return(false)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment