fix tests

Author: Vivek Bisen

.pryrc

@@ -0,0 +1,11 @@
+if defined?(PryByebug)
+  Pry.commands.alias_command 'c', 'continue'
+  Pry.commands.alias_command 's', 'step'
+  Pry.commands.alias_command 'n', 'next'
+  Pry.commands.alias_command 'f', 'finish'
+  Pry.commands.alias_command 'w', 'pry-backtrace'
+
+  Pry::Commands.command(/^$/, 'repeat last command') do
+    pry_instance.run_command Pry.history.to_a.last
+  end
+end

departure.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
-  spec.add_development_dependency 'byebug', '~> 8.2', '>= 8.2.1'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'climate_control', '~> 0.0.3'
 end

lib/active_record/connection_adapters/percona_adapter.rb

@@ -9,7 +9,10 @@ module ConnectionHandling
     # Establishes a connection to the database that's used by all Active
     # Record objects.
     def percona_connection(config)
-      config[:username] = 'root' if config[:username].nil?
+      if config[:username].nil?
+        config = config.dup if config.frozen?
+        config[:username] = 'root'
+      end
       mysql2_connection = mysql2_connection(config)
 
       connection_details = Departure::ConnectionDetails.new(config)
@@ -75,7 +78,7 @@ def initialize(connection, _logger, connection_options, _config)
       end
 
       def write_query?(sql) # :nodoc:
-        !build_read_query_regexp(
+        !ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
           :desc, :describe, :set, :show, :use
         ).match?(sql)
       end

spec/active_record/connection_adapters/percona_adapter_spec.rb

@@ -101,24 +101,46 @@
     describe '#add_index' do
       let(:table_name) { :foo }
       let(:column_name) { :bar_id }
-      let(:options) { {} }
-      let(:sql) { 'ADD index_type INDEX `index_name` (`bar_id`)' }
+      let(:index_name) { 'index_name' }
+      let(:options) { {type: 'index_type'} }
+      let(:index_type) { options[:type].upcase }
+      let(:sql) { 'ADD index_type INDEX `index_name` (bar_id)' }
+      let(:index_options) do
+        if ActiveRecord::VERSION::STRING >= '6.1'
+          [
+            ActiveRecord::ConnectionAdapters::IndexDefinition.new(
+              table_name,
+              index_name,
+              nil,
+              [column_name],
+              **options
+            ),
+            nil,
+            false
+          ]
+        else
+          [index_name, index_type, "#{column_name}"]
+        end
+      end
+
+      let(:expected_sql) do
+        if ActiveRecord::VERSION::STRING >= '6.1'
+          "CREATE INDEX_TYPE INDEX `#{index_name}` ON `#{table_name}` (`#{column_name}`)"
+        else
+          "ALTER TABLE `#{table_name}` ADD #{index_type} INDEX `#{index_name}` (#{column_name})"
+        end
+      end
 
       before do
         allow(adapter).to(
           receive(:add_index_options)
           .with(table_name, column_name, options)
-          .and_return(['index_name', 'index_type', "`#{column_name}`"])
+          .and_return(index_options)
         )
       end
 
       it 'passes the built SQL to #execute' do
-        expect(adapter).to(
-          receive(:execute)
-          .with(
-            "ALTER TABLE `#{table_name}` ADD index_type INDEX `index_name` (`bar_id`)"
-          )
-        )
+        expect(adapter).to receive(:execute).with(expected_sql)
         adapter.add_index(table_name, column_name, options)
       end
     end

spec/integration_spec.rb

@@ -9,6 +9,14 @@ class Comment < ActiveRecord::Base; end
   end
 
   let(:direction) { :up }
+  let(:pool) { ActiveRecord::Base.connection_pool }
+  let(:spec_config) do
+    if ActiveRecord::VERSION::STRING >= '6.1'
+      pool.connection.instance_variable_get(:@config)
+    else
+      pool.spec.config
+    end
+  end
 
   it 'has a version number' do
     expect(Departure::VERSION).not_to be nil
@@ -51,8 +59,7 @@ class Comment < ActiveRecord::Base; end
 
     it 'reconnects to the database using PerconaAdapter' do
       ActiveRecord::Migrator.new(direction, migration_fixtures, ActiveRecord::SchemaMigration, 1).migrate
-      expect(ActiveRecord::Base.connection_pool.spec.config[:adapter])
-        .to eq('percona')
+      expect(spec_config[:adapter]).to eq('percona')
     end
 
     context 'when a username is provided' do
@@ -68,8 +75,7 @@ class Comment < ActiveRecord::Base; end
 
       it 'uses the provided username' do
         ActiveRecord::Migrator.new(direction, migration_fixtures, ActiveRecord::SchemaMigration, 1).migrate
-        expect(ActiveRecord::Base.connection_pool.spec.config[:username])
-          .to eq('root')
+        expect(spec_config[:username]).to eq('root')
       end
     end
 
@@ -85,8 +91,7 @@ class Comment < ActiveRecord::Base; end
 
       it 'uses root' do
         ActiveRecord::Migrator.new(direction, migration_fixtures, ActiveRecord::SchemaMigration, 1).migrate
-        expect(ActiveRecord::Base.connection_pool.spec.config[:username])
-          .to eq('root')
+        expect(spec_config[:username]).to eq('root')
       end
     end
 

spec/lhm/column_with_sql_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Lhm::ColumnWithSql do
-  let(:name) { :some_field_name }
+  let(:name) { "some_field_name" }
   let(:column) { described_class.new(name, definition) }
 
   describe '#attributes' do