Merge pull request rails#46067 from eileencodes/dont-delegate-tasks-to-base

Don't delegate tasks to ActiveRecord::Base

Author: eileencodes

activerecord/lib/active_record/tasks/mysql_database_tasks.rb

@@ -5,8 +5,6 @@ module Tasks # :nodoc:
     class MySQLDatabaseTasks # :nodoc:
       ER_DB_CREATE_EXISTS = 1007
 
-      delegate :connection, :establish_connection, to: ActiveRecord::Base
-
       def self.using_database_configurations?
         true
       end
@@ -19,11 +17,11 @@ def initialize(db_config)
       def create
         establish_connection(configuration_hash_without_database)
         connection.create_database(db_config.database, creation_options)
-        establish_connection(db_config)
+        establish_connection
       end
 
       def drop
-        establish_connection(db_config)
+        establish_connection
         connection.drop_database(db_config.database)
       end
 
@@ -71,6 +69,14 @@ def structure_load(filename, extra_flags)
       private
         attr_reader :db_config, :configuration_hash
 
+        def connection
+          ActiveRecord::Base.connection
+        end
+
+        def establish_connection(config = db_config)
+          ActiveRecord::Base.establish_connection(config)
+        end
+
         def configuration_hash_without_database
           configuration_hash.merge(database: nil)
         end

activerecord/lib/active_record/tasks/postgresql_database_tasks.rb

@@ -9,9 +9,6 @@ class PostgreSQLDatabaseTasks # :nodoc:
       ON_ERROR_STOP_1 = "ON_ERROR_STOP=1"
       SQL_COMMENT_BEGIN = "--"
 
-      delegate :connection, :establish_connection, :clear_active_connections!,
-        to: ActiveRecord::Base
-
       def self.using_database_configurations?
         true
       end
@@ -21,14 +18,14 @@ def initialize(db_config)
         @configuration_hash = db_config.configuration_hash
       end
 
-      def create(master_established = false)
-        establish_master_connection unless master_established
+      def create(connection_already_established = false)
+        establish_connection(public_schema_config) unless connection_already_established
         connection.create_database(db_config.database, configuration_hash.merge(encoding: encoding))
-        establish_connection(db_config)
+        establish_connection
       end
 
       def drop
-        establish_master_connection
+        establish_connection(public_schema_config)
         connection.drop_database(db_config.database)
       end
 
@@ -41,7 +38,7 @@ def collation
       end
 
       def purge
-        clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
         drop
         create true
       end
@@ -90,15 +87,20 @@ def structure_load(filename, extra_flags)
       private
         attr_reader :db_config, :configuration_hash
 
+        def connection
+          ActiveRecord::Base.connection
+        end
+
+        def establish_connection(config = db_config)
+          ActiveRecord::Base.establish_connection(config)
+        end
+
         def encoding
           configuration_hash[:encoding] || DEFAULT_ENCODING
         end
 
-        def establish_master_connection
-          establish_connection configuration_hash.merge(
-            database: "postgres",
-            schema_search_path: "public"
-          )
+        def public_schema_config
+          configuration_hash.merge(database: "postgres", schema_search_path: "public")
         end
 
         def psql_env

activerecord/lib/active_record/tasks/sqlite_database_tasks.rb

@@ -3,8 +3,6 @@
 module ActiveRecord
   module Tasks # :nodoc:
     class SQLiteDatabaseTasks # :nodoc:
-      delegate :connection, :establish_connection, to: ActiveRecord::Base
-
       def self.using_database_configurations?
         true
       end
@@ -17,7 +15,7 @@ def initialize(db_config, root = ActiveRecord::Tasks::DatabaseTasks.root)
       def create
         raise DatabaseAlreadyExists if File.exist?(db_config.database)
 
-        establish_connection(db_config)
+        establish_connection
         connection
       end
 
@@ -68,6 +66,14 @@ def structure_load(filename, extra_flags)
       private
         attr_reader :db_config, :root
 
+        def connection
+          ActiveRecord::Base.connection
+        end
+
+        def establish_connection(config = db_config)
+          ActiveRecord::Base.establish_connection(config)
+        end
+
         def run_cmd(cmd, args, out)
           fail run_cmd_error(cmd, args) unless Kernel.system(cmd, *args, out: out)
         end

activerecord/test/cases/tasks/postgresql_rake_test.rb

@@ -208,8 +208,8 @@ def drop_database(*); end
 
       def test_clears_active_connections
         with_stubbed_connection do
-          ActiveRecord::Base.stub(:establish_connection, nil) do
-            assert_called(ActiveRecord::Base, :clear_active_connections!) do
+          ActiveRecord::Base.connection_handler.stub(:establish_connection, nil) do
+            assert_called(ActiveRecord::Base.connection_handler, :clear_active_connections!) do
               ActiveRecord::Tasks::DatabaseTasks.purge @configuration
             end
           end