Commit c2745ad6 authored by Peter Leitzen's avatar Peter Leitzen

RuboCop: Allow `add_foreign_key` within `with_lock_retries`

parent 1343456a
...@@ -11,7 +11,11 @@ module RuboCop ...@@ -11,7 +11,11 @@ module RuboCop
MSG = '`add_foreign_key` requires downtime, use `add_concurrent_foreign_key` instead'.freeze MSG = '`add_foreign_key` requires downtime, use `add_concurrent_foreign_key` instead'.freeze
def_node_matcher :false_node?, <<~PATTERN def_node_matcher :false_node?, <<~PATTERN
(false) (false)
PATTERN
def_node_matcher :with_lock_retries?, <<~PATTERN
(:send nil? :with_lock_retries)
PATTERN PATTERN
def on_send(node) def on_send(node)
...@@ -19,9 +23,11 @@ module RuboCop ...@@ -19,9 +23,11 @@ module RuboCop
name = node.children[1] name = node.children[1]
if name == :add_foreign_key && !not_valid_fk?(node) return unless name == :add_foreign_key
add_offense(node, location: :selector) return if in_with_lock_retries?(node)
end return if not_valid_fk?(node)
add_offense(node, location: :selector)
end end
def method_name(node) def method_name(node)
...@@ -33,6 +39,12 @@ module RuboCop ...@@ -33,6 +39,12 @@ module RuboCop
pair.children[0].children[0] == :validate && false_node?(pair.children[1]) pair.children[0].children[0] == :validate && false_node?(pair.children[1])
end end
end end
def in_with_lock_retries?(node)
node.each_ancestor(:block).any? do |parent|
with_lock_retries?(parent.to_a.first)
end
end
end end
end end
end end
......
...@@ -36,5 +36,15 @@ RSpec.describe RuboCop::Cop::Migration::AddConcurrentForeignKey, type: :rubocop ...@@ -36,5 +36,15 @@ RSpec.describe RuboCop::Cop::Migration::AddConcurrentForeignKey, type: :rubocop
expect(cop.offenses).to be_empty expect(cop.offenses).to be_empty
end end
it 'does not register an offense when `add_foreign_key` is within `with_lock_retries`' do
inspect_source <<~RUBY
with_lock_retries do
add_foreign_key :key, :projects, column: :project_id, on_delete: :cascade
end
RUBY
expect(cop.offenses).to be_empty
end
end end
end end
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