Move AR adapter related helper methods under AR::TestCase

These helpers are called from both test class definition and test execution,
so we're defining them as both class and instance methods on AR::TestCase.

Author: amatsuda

activerecord/test/cases/helper.rb

@@ -33,83 +33,6 @@
 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

activerecord/test/cases/test_case.rb

@@ -8,6 +8,7 @@
 require "active_record/fixtures"
 
 require "cases/validations_repair_helper"
+require_relative "../support/adapter_helper"
 
 module ActiveRecord
   # = Active Record Test Case
@@ -18,6 +19,8 @@ class TestCase < ActiveSupport::TestCase # :nodoc:
     include ActiveSupport::Testing::Stream
     include ActiveRecord::TestFixtures
     include ActiveRecord::ValidationsRepairHelper
+    include AdapterHelper
+    extend AdapterHelper
 
     self.fixture_path = FIXTURES_ROOT
     self.use_instantiated_fixtures = false

activerecord/test/support/adapter_helper.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module AdapterHelper
+  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
+end