Merge pull request #9118 from dazuma/remove_adapter_names_from_databases_rake

Fix to databases.rake so third party adapters can register rake task implementations

1 files changed, 3 insertions, 9 deletions

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 259d0ff12b..f36af7182f 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -284,8 +284,6 @@ db_namespace = namespace :db do
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
       current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
       case current_config['adapter']
-      when /mysql/, /postgresql/, /sqlite/
-        ActiveRecord::Tasks::DatabaseTasks.structure_dump(current_config, filename)
       when 'oci', 'oracle'
         ActiveRecord::Base.establish_connection(current_config)
         File.open(filename, "w:utf-8") { |f| f << ActiveRecord::Base.connection.structure_dump }
@@ -296,7 +294,7 @@ db_namespace = namespace :db do
         db_string = firebird_db_string(current_config)
         sh "isql -a #{db_string} > #{filename}"
       else
-        raise "Task not supported by '#{current_config["adapter"]}'"
+        ActiveRecord::Tasks::DatabaseTasks.structure_dump(current_config, filename)
       end
 
       if ActiveRecord::Base.connection.supports_migrations?
@@ -312,8 +310,6 @@ db_namespace = namespace :db do
       current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
       filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
       case current_config['adapter']
-      when /mysql/, /postgresql/, /sqlite/
-        ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)
       when 'sqlserver'
         `sqlcmd -S #{current_config['host']} -d #{current_config['database']} -U #{current_config['username']} -P #{current_config['password']} -i #{filename}`
       when 'oci', 'oracle'
@@ -326,7 +322,7 @@ db_namespace = namespace :db do
         db_string = firebird_db_string(current_config)
         sh "isql -i #{filename} #{db_string}"
       else
-        raise "Task not supported by '#{current_config['adapter']}'"
+        ActiveRecord::Tasks::DatabaseTasks.structure_load(current_config, filename)
       end
     end
 
@@ -384,8 +380,6 @@ db_namespace = namespace :db do
     task :purge => [:environment, :load_config] do
       abcs = ActiveRecord::Base.configurations
       case abcs['test']['adapter']
-      when /mysql/, /postgresql/, /sqlite/
-        ActiveRecord::Tasks::DatabaseTasks.purge abcs['test']
       when 'sqlserver'
         test = abcs.deep_dup['test']
         test_database = test['database']
@@ -401,7 +395,7 @@ db_namespace = namespace :db do
         ActiveRecord::Base.establish_connection(:test)
         ActiveRecord::Base.connection.recreate_database!
       else
-        raise "Task not supported by '#{abcs['test']['adapter']}'"
+        ActiveRecord::Tasks::DatabaseTasks.purge abcs['test']
       end
     end