add rails 6.1 support

Author: urkle

.github/workflows/prs.yml

@@ -23,6 +23,7 @@ jobs:
         - '5.1'
         - '5.2'
         - '6.0'
+        - '6.1'
         exclude:
         - ruby: '3.0'
           activerecord: '5.1'

ar-multidb.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5.0'
 
-  s.add_runtime_dependency 'activerecord', '>= 5.1', '< 6.1'
-  s.add_runtime_dependency 'activesupport', '>= 5.1', '< 6.1'
+  s.add_runtime_dependency 'activerecord', '>= 5.1', '< 6.2'
+  s.add_runtime_dependency 'activesupport', '>= 5.1', '< 6.2'
 
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.8'

gemfiles/activerecord-6.1.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 6.1.0'
+
+gemspec path: '..'

lib/multidb/candidate.rb

@@ -2,13 +2,22 @@
 
 module Multidb
   class Candidate
+    USE_RAILS_61 = Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new('6.1')
+    SPEC_NAME = if USE_RAILS_61
+                  'ActiveRecord::Base'
+                else
+                  'primary'
+                end
+
     def initialize(name, target)
       @name = name
 
       case target
       when Hash
+        target = target.merge(name: 'primary') unless USE_RAILS_61
+
         @connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-        @connection_handler.establish_connection(target.merge(name: 'primary'))
+        @connection_handler.establish_connection(target)
       when ActiveRecord::ConnectionAdapters::ConnectionHandler
         @connection_handler = target
       else
@@ -18,9 +27,9 @@ def initialize(name, target)
 
     def connection(&block)
       if block_given?
-        @connection_handler.retrieve_connection_pool('primary').with_connection(&block)
+        @connection_handler.retrieve_connection_pool(SPEC_NAME).with_connection(&block)
       else
-        @connection_handler.retrieve_connection('primary')
+        @connection_handler.retrieve_connection(SPEC_NAME)
       end
     end
 

lib/multidb/model_extensions.rb

@@ -6,7 +6,13 @@ module Multidb
   module Connection
     def establish_connection(spec = nil)
       super(spec)
-      Multidb.init(connection_pool.spec.config)
+      config = if connection_pool.respond_to?(:db_config)
+                 connection_pool.db_config.configuration_hash
+               else
+                 connection_pool.spec.config
+               end
+
+      Multidb.init(config)
     end
 
     def connection

spec/lib/multidb/candidate_spec.rb

@@ -18,7 +18,7 @@
         expect(handler).to an_instance_of(ActiveRecord::ConnectionAdapters::ConnectionHandler)
       end
 
-      it 'merges the name: primary into the hash' do
+      it 'merges the name: primary into the hash', rails: '< 6.1' do
         handler = instance_double('ActiveRecord::ConnectionAdapters::ConnectionHandler')
         allow(ActiveRecord::ConnectionAdapters::ConnectionHandler).to receive(:new).and_return(handler)
         allow(handler).to receive(:establish_connection)
@@ -68,7 +68,7 @@
       it 'calls retrieve_connection_pool' do
         subject.connection { |_| nil }
 
-        expect(target).to have_received(:retrieve_connection_pool).with('primary')
+        expect(target).to have_received(:retrieve_connection_pool).with(Multidb::Candidate::SPEC_NAME)
       end
 
       it 'yields a connection object' do
@@ -82,7 +82,7 @@
       it 'calls retrieve_connection on the handler' do
         subject.connection
 
-        expect(target).to have_received(:retrieve_connection).with('primary')
+        expect(target).to have_received(:retrieve_connection).with(Multidb::Candidate::SPEC_NAME)
       end
     end
   end

spec/spec_helper.rb

@@ -23,6 +23,12 @@
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
+  config.filter_run_excluding rails: lambda { |v|
+    rails_version = Gem::Version.new(ActiveRecord::VERSION::STRING)
+    test = Gem::Requirement.new(v)
+    !test.satisfied_by?(rails_version)
+  }
+
   config.expect_with :rspec do |expectations|
     expectations.syntax = :expect
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true