Merge pull request rails#46865 from amatsuda/AR_object_pollutions

Cleanup Object pollutions within AR tests by moving test helpers under AR::TestCase

Author: amatsuda

activerecord/test/cases/adapter_test.rb

@@ -475,8 +475,8 @@ def reset_fixtures(*fixture_names)
       end
   end
 
-  unless in_memory_db?
-    class AdapterConnectionTest < ActiveRecord::TestCase
+  class AdapterConnectionTest < ActiveRecord::TestCase
+    unless in_memory_db?
       self.use_transactional_tests = false
 
       fixtures :posts, :authors, :author_addresses

activerecord/test/cases/adapters/mysql2/optimizer_hints_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "models/post"
 
-if supports_optimizer_hints?
-  class Mysql2OptimizerHintsTest < ActiveRecord::Mysql2TestCase
+class Mysql2OptimizerHintsTest < ActiveRecord::Mysql2TestCase
+  if supports_optimizer_hints?
     fixtures :posts
 
     def test_optimizer_hints

activerecord/test/cases/adapters/postgresql/optimizer_hints_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "models/post"
 
-if supports_optimizer_hints?
-  class PostgresqlOptimizerHintsTest < ActiveRecord::PostgreSQLTestCase
+class PostgresqlOptimizerHintsTest < ActiveRecord::PostgreSQLTestCase
+  if supports_optimizer_hints?
     fixtures :posts
 
     def setup

activerecord/test/cases/connection_adapters/mysql_type_lookup_test.rb

@@ -3,10 +3,10 @@
 require "cases/helper"
 require "support/connection_helper"
 
-if current_adapter?(:Mysql2Adapter)
-  module ActiveRecord
-    module ConnectionAdapters
-      class MysqlTypeLookupTest < ActiveRecord::TestCase
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlTypeLookupTest < ActiveRecord::TestCase
+      if current_adapter?(:Mysql2Adapter)
         include ConnectionHelper
 
         setup do

activerecord/test/cases/connection_adapters/type_lookup_test.rb

@@ -2,10 +2,10 @@
 
 require "cases/helper"
 
-unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strings for lookup
-  module ActiveRecord
-    module ConnectionAdapters
-      class TypeLookupTest < ActiveRecord::TestCase
+module ActiveRecord
+  module ConnectionAdapters
+    class TypeLookupTest < ActiveRecord::TestCase
+      unless current_adapter?(:PostgreSQLAdapter) # PostgreSQL does not use type strings for lookup
         setup do
           @connection = ActiveRecord::Base.connection
         end

activerecord/test/cases/date_time_precision_test.rb

@@ -3,8 +3,8 @@
 require "cases/helper"
 require "support/schema_dumping_helper"
 
-if supports_datetime_with_precision?
-  class DateTimePrecisionTest < ActiveRecord::TestCase
+class DateTimePrecisionTest < ActiveRecord::TestCase
+  if supports_datetime_with_precision?
     include SchemaDumpingHelper
     self.use_transactional_tests = false
 

activerecord/test/cases/defaults_test.rb

@@ -83,8 +83,8 @@ def test_default_strings_containing_single_quotes
   end
 end
 
-if current_adapter?(:SQLite3Adapter, :PostgreSQLAdapter)
-  class DefaultBinaryTest < ActiveRecord::TestCase
+class DefaultBinaryTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter, :PostgreSQLAdapter)
     class DefaultBinary < ActiveRecord::Base; end
 
     setup do
@@ -116,8 +116,8 @@ def test_default_varbinary_string_that_looks_like_hex
   end
 end
 
-if supports_text_column_with_default?
-  class DefaultTextTest < ActiveRecord::TestCase
+class DefaultTextTest < ActiveRecord::TestCase
+  if supports_text_column_with_default?
     class DefaultText < ActiveRecord::Base; end
 
     setup do
@@ -143,8 +143,8 @@ def test_default_texts_containing_single_quotes
   end
 end
 
-if current_adapter?(:PostgreSQLAdapter)
-  class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
+class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:PostgreSQLAdapter)
     include SchemaDumpingHelper
 
     test "schema dump includes default expression" do
@@ -164,8 +164,8 @@ class PostgresqlDefaultExpressionTest < ActiveRecord::TestCase
   end
 end
 
-if current_adapter?(:Mysql2Adapter)
-  class MysqlDefaultExpressionTest < ActiveRecord::TestCase
+class MysqlDefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     include SchemaDumpingHelper
 
     if supports_default_expression?
@@ -212,8 +212,10 @@ class MysqlDefaultExpressionTest < ActiveRecord::TestCase
       end
     end
   end
+end
 
-  class DefaultsTestWithoutTransactionalFixtures < ActiveRecord::TestCase
+class DefaultsTestWithoutTransactionalFixtures < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     # ActiveRecord::Base#create! (and #save and other related methods) will
     # open a new transaction. When in transactional tests mode, this will
     # cause Active Record to create a new savepoint. However, since MySQL doesn't
@@ -298,8 +300,8 @@ def with_mysql_not_null_table
   end
 end
 
-if current_adapter?(:SQLite3Adapter)
-  class Sqlite3DefaultExpressionTest < ActiveRecord::TestCase
+class Sqlite3DefaultExpressionTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter)
     include SchemaDumpingHelper
 
     test "schema dump includes default expression" do

activerecord/test/cases/fixtures_test.rb

@@ -1510,8 +1510,8 @@ class PrimaryKeyErrorTest < ActiveRecord::TestCase
   end
 end
 
-if current_adapter?(:SQLite3Adapter) && !in_memory_db?
-  class MultipleFixtureConnectionsTest < ActiveRecord::TestCase
+class MultipleFixtureConnectionsTest < ActiveRecord::TestCase
+  if current_adapter?(:SQLite3Adapter) && !in_memory_db?
     include ActiveRecord::TestFixtures
 
     fixtures :dogs

activerecord/test/cases/helper.rb

@@ -11,9 +11,6 @@
 require "active_support/core_ext/kernel/reporting"
 require "active_support/core_ext/kernel/singleton_class"
 
-require "support/config"
-require "support/connection"
-
 # TODO: Move all these random hacks into the ARTest namespace and into the support/ dir
 
 Thread.abort_on_exception = true
@@ -24,113 +21,12 @@
 # Disable available locale checks to avoid warnings running the test suite.
 I18n.enforce_available_locales = false
 
-# Connect to the database
-ARTest.connect
-
 # Quote "type" if it's a reserved word for the current connection.
 QUOTED_TYPE = ActiveRecord::Base.connection.quote_column_name("type")
 
 ActiveRecord.raise_on_assign_to_attr_readonly = true
 ActiveRecord.belongs_to_required_validates_foreign_key = false
 
-def current_adapter?(*types)
-  types.any? do |type|
-    ActiveRecord::ConnectionAdapters.const_defined?(type) &&
-      ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters.const_get(type))
-  end
-end
-
-def in_memory_db?
-  current_adapter?(:SQLite3Adapter) &&
-  ActiveRecord::Base.connection_pool.db_config.database == ":memory:"
-end
-
-def mysql_enforcing_gtid_consistency?
-  current_adapter?(:Mysql2Adapter) && "ON" == ActiveRecord::Base.connection.show_variable("enforce_gtid_consistency")
-end
-
-def supports_default_expression?
-  if current_adapter?(:PostgreSQLAdapter)
-    true
-  elsif current_adapter?(:Mysql2Adapter)
-    conn = ActiveRecord::Base.connection
-    !conn.mariadb? && conn.database_version >= "8.0.13"
-  end
-end
-
-def supports_non_unique_constraint_name?
-  if current_adapter?(:Mysql2Adapter)
-    conn = ActiveRecord::Base.connection
-    conn.mariadb?
-  else
-    false
-  end
-end
-
-def supports_text_column_with_default?
-  if current_adapter?(:Mysql2Adapter)
-    conn = ActiveRecord::Base.connection
-    conn.mariadb? && conn.database_version >= "10.2.1"
-  else
-    true
-  end
-end
-
-%w[
-  supports_savepoints?
-  supports_partial_index?
-  supports_partitioned_indexes?
-  supports_expression_index?
-  supports_insert_returning?
-  supports_insert_on_duplicate_skip?
-  supports_insert_on_duplicate_update?
-  supports_insert_conflict_target?
-  supports_optimizer_hints?
-  supports_datetime_with_precision?
-].each do |method_name|
-  define_method method_name do
-    ActiveRecord::Base.connection.public_send(method_name)
-  end
-end
-
-def enable_extension!(extension, connection)
-  return false unless connection.supports_extensions?
-  return connection.reconnect! if connection.extension_enabled?(extension)
-
-  connection.enable_extension extension
-  connection.commit_db_transaction if connection.transaction_open?
-  connection.reconnect!
-end
-
-def disable_extension!(extension, connection)
-  return false unless connection.supports_extensions?
-  return true unless connection.extension_enabled?(extension)
-
-  connection.disable_extension(extension, force: :cascade)
-  connection.reconnect!
-end
-
-def load_schema
-  # silence verbose schema loading
-  original_stdout = $stdout
-  $stdout = StringIO.new
-
-  adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
-  adapter_specific_schema_file = SCHEMA_ROOT + "/#{adapter_name}_specific_schema.rb"
-
-  load SCHEMA_ROOT + "/schema.rb"
-
-  if File.exist?(adapter_specific_schema_file)
-    load adapter_specific_schema_file
-  end
-
-  ActiveRecord::FixtureSet.reset_cache
-ensure
-  $stdout = original_stdout
-end
-
-load_schema
-
 class SQLSubscriber
   attr_reader :logged
   attr_reader :payloads

activerecord/test/cases/invalid_connection_test.rb

@@ -2,8 +2,8 @@
 
 require "cases/helper"
 
-if current_adapter?(:Mysql2Adapter)
-  class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
+class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
+  if current_adapter?(:Mysql2Adapter)
     self.use_transactional_tests = false
 
     class Bird < ActiveRecord::Base