TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #41760 from Shopify/register-task-precedence

Browse Source 
Give precedence to the DatabaseTasks registered last
This commit is contained in:
Rafael França 2021-03-25 17:28:46 -04:00 committed by GitHub
commit 30ef29289b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/tasks/database_tasks.rb
View File

@ -537,7 +537,7 @@ def database_adapter_for(db_config, *arguments)
end
def class_for_adapter(adapter)
_key, task = @tasks.each_pair.detect { |pattern, _task| adapter[pattern] }
_key, task = @tasks.reverse_each.detect { |pattern, _task| adapter[pattern] }
unless task
raise DatabaseNotSupported, "Rake tasks not supported by '#{adapter}' adapter"
end

15
activerecord/test/cases/tasks/database_tasks_test.rb
View File

@ -185,6 +185,21 @@ def structure_dump(filename); end
end
end
def test_register_task_precedence
klazz = Class.new do
def initialize(*arguments); end
def structure_dump(filename); end
end
instance = klazz.new
klazz.stub(:new, instance) do
assert_called_with(instance, :structure_dump, ["awesome-file.sql", nil]) do
ActiveRecord::Tasks::DatabaseTasks.register_task(/custom_mysql/, klazz)
ActiveRecord::Tasks::DatabaseTasks.structure_dump({ "adapter" => :custom_mysql }, "awesome-file.sql")
end
end
end
def test_unregistered_task
assert_raise(ActiveRecord::Tasks::DatabaseNotSupported) do
ActiveRecord::Tasks::DatabaseTasks.structure_dump({ "adapter" => :bar }, "awesome-file.sql")