BACKUP - currently getting rails 8.1 to switch intelligently between trilogy, right now it will always use trilogy if it is present in the gemfile

Author: Austio

README.md

@@ -154,15 +154,13 @@ All configuration options are configurable from the `Departure.configure` block
 | Option                            | Default | What it Controls                                                                                                                                                          |
 |-----------------------------------|---------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | disable_rails_advisory_lock_patch | false   | When truthy, disables a patch in at least rails 7.1 and 7.2 where rails throws ConcurrentMigrationErrors due to the inability to release the advisory lock in migrations  |
-| db_adapter_name                   | nil     | 'mysql2' or 'percona' - gives users an ability to provide the specific db adapter to override the db_adapter we use in departure see Db Adapter Support Below for details |
 
-### Db Adapter Support
+### Trilogy Adapter Support
 
 Starting in Rails 8.1 we add support for the use of the trilogy database adapter gem.  Logic for selecting an adapter follows this logic
 
-1. Departure.configuration.db_adapter_name is set to 'mysql2' or 'trilogy' use that value
-2. If the database configuration specifies 'mysql2 or 'trilogy' use that adapter
-3. Default to mysql2
+1. If the database configuration specifies 'trilogy' use the trilogy adapter
+2. Default to mysql2
 
 ### Disable on per-migration basis
 

lib/active_record/connection_adapters/rails_8_1_mysql2_adapter.rb

@@ -40,6 +40,7 @@ def visit_DropForeignKey(name) # rubocop:disable Naming/MethodName
       ADAPTER_NAME = 'Percona'.freeze
 
       def self.new_client(config)
+        binding.pry
         original_client = super
 
         Departure::DbClient.new(config, original_client)

lib/departure/rails_adapter.rb

@@ -24,13 +24,12 @@ def for_current(**args)
 
       def for(ar_version, db_connection_adapter: nil)
         if ar_version::MAJOR == 8 && ar_version::MINOR.positive?
-          case specifies_adapter(db_connection_adapter)
-          when 'mysql2'
-            V8_1_Adapter
-          when 'trilogy'
+          require 'pry'
+          binding.pry
+          if db_connection_adapter == 'trilogy'
             V8_1_TrilogyAdapter
           else
-            V8_1_Adapter
+            V8_1_Mysql2Adapter
           end
         elsif ar_version::MAJOR == 8
           V8_0_Adapter
@@ -42,10 +41,6 @@ def for(ar_version, db_connection_adapter: nil)
           raise "Unsupported Rails version: #{ar_version}"
         end
       end
-
-      def specifies_adapter(db_connection_adapter)
-        Departure.configuration.db_adapter_name.presence || db_connection_adapter
-      end
     end
 
     class BaseAdapter
@@ -168,7 +163,7 @@ def sql_column
       end
     end
 
-    class V8_1_Adapter < BaseAdapter # rubocop:disable Naming/ClassAndModuleCamelCase
+    class V8_1_Mysql2Adapter < BaseAdapter # rubocop:disable Naming/ClassAndModuleCamelCase
       class << self
         def register_integrations
           require 'active_record/connection_adapters/rails_8_1_mysql2_adapter'
@@ -210,12 +205,20 @@ def sql_column
       end
     end
 
-    class V8_1_TrilogyAdapter < V8_1_Adapter # rubocop:disable Naming/ClassAndModuleCamelCase
+    class V8_1_TrilogyAdapter < V8_1_Mysql2Adapter # rubocop:disable Naming/ClassAndModuleCamelCase
       class << self
         def register_integrations
           require 'active_record/connection_adapters/rails_8_1_trilogy_adapter'
           require 'departure/rails_patches/active_record_migrator_with_advisory_lock_patch'
 
+          ActiveSupport.on_load(:active_record) do
+            ActiveRecord::Migration.class_eval do
+              include Departure::Migration
+            end
+
+            ActiveRecord::Migrator.prepend Departure::RailsPatches::ActiveRecordMigratorWithAdvisoryLockPatch
+          end
+
           ActiveRecord::ConnectionAdapters.register 'percona',
                                                     'ActiveRecord::ConnectionAdapters::Rails81TrilogyAdapter',
                                                     'active_record/connection_adapters/rails_8_1_trilogy_adapter'

spec/integration/rails_adapter_spec.rb

@@ -23,11 +23,6 @@ def instance_for(version, db_connection_adapter = 'mysql2')
         it 'when the config specifies an adapter of trilogy' do
           expect(instance_for('8.1.0', 'trilogy')).to be(Departure::RailsAdapter::V8_1_TrilogyAdapter)
         end
-
-        it 'when the config specifies an adapter of trilogy regardless of the db-connection_adapter' do
-          expect(Departure.configuration).to receive(:db_adapter_name) { 'trilogy' }
-          expect(instance_for('8.1.0', 'mysql2')).to be(Departure::RailsAdapter::V8_1_TrilogyAdapter)
-        end
       end
 
       describe 'returns mysql2 adapter' do
@@ -40,9 +35,8 @@ def instance_for(version, db_connection_adapter = 'mysql2')
           expect(instance_for('8.1.0', 'mysql2')).to be(Departure::RailsAdapter::V8_1_Adapter)
         end
 
-        it 'when the config specifies an adapter of mysql2 regardless of the db-connection_adapter' do
-          expect(Departure.configuration).to receive(:db_adapter_name) { 'mysql2' }
-          expect(instance_for('8.1.0', 'trilogy')).to be(Departure::RailsAdapter::V8_1_Adapter)
+        it 'when the config specifies anything else' do
+          expect(instance_for('8.1.0', 'percona')).to be(Departure::RailsAdapter::V8_1_Adapter)
         end
       end
     end