Commit d1955dad authored by Bob Van Landuyt's avatar Bob Van Landuyt

Avoid duplication when calling `exec_query`

parent b2186b67
...@@ -67,19 +67,19 @@ class ConsumeRemainingMigrateApproverToApprovalRulesInBatchJobs < ActiveRecord:: ...@@ -67,19 +67,19 @@ class ConsumeRemainingMigrateApproverToApprovalRulesInBatchJobs < ActiveRecord::
loop do loop do
# search for next wrong MR # search for next wrong MR
lower_bound = exec_query("#{BASE_QUERY} AND merge_requests.id BETWEEN #{lower_bound} AND #{upper_bound} ORDER BY merge_requests.id ASC LIMIT 1").rows.dig(0, 0) lower_bound = exec_query("#{BASE_QUERY} AND merge_requests.id BETWEEN #{lower_bound} AND #{upper_bound} ORDER BY merge_requests.id ASC LIMIT 1").dig(0, 0)
return bad_ids if lower_bound.nil? return bad_ids if lower_bound.nil?
end_id = lower_bound + JOIN_SIZE end_id = lower_bound + JOIN_SIZE
bad_ids.concat exec_query("#{BASE_QUERY} AND merge_requests.id BETWEEN #{lower_bound} AND #{end_id} ORDER BY merge_requests.id ASC").rows.flatten bad_ids.concat exec_query("#{BASE_QUERY} AND merge_requests.id BETWEEN #{lower_bound} AND #{end_id} ORDER BY merge_requests.id ASC").flatten
lower_bound = end_id + 1 lower_bound = end_id + 1
end end
end end
def exec_query(query) def exec_query(query)
ActiveRecord::Base.connection.exec_query(query) ActiveRecord::Base.connection.exec_query(query).rows
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