Merge 1074225 into dcb8eae

Author: fgarces

.gitignore

@@ -10,4 +10,5 @@
 .idea/
 Gemfile.lock
 gemfiles/*.gemfile.lock
+gemfiles/.bundle/
 log/

Appraisals

@@ -3,5 +3,5 @@ appraise 'activerecord-5' do
 end
 
 appraise 'activerecord-6' do
-  gem 'activerecord', '< 6.1'
+  gem 'activerecord', '< 6.2.0'
 end

gemfiles/activerecord_6.gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "< 6.1"
+gem "activerecord", "< 6.2.0"
 
 gemspec path: "../"

lib/postgres/vacuum/compatibility.rb

@@ -0,0 +1,13 @@
+module Postgres
+  module Vacuum
+    class Compatibility
+      ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
+      PRE_RAILS_6_1 = ACTIVE_RECORD_VERSION < ::Gem::Version.new('6.1.0')
+
+      def self.pre_rails_6_1?
+        PRE_RAILS_6_1
+      end
+
+    end
+  end
+end

lib/postgres/vacuum/jobs/monitor_job.rb

@@ -80,7 +80,8 @@ def reporter_class
         def with_each_db_name_and_connection
           databases = Set.new
           ActiveRecord::Base.connection_handler.connection_pools.map do |connection_pool|
-            db_name = connection_pool.spec.config[:database]
+            db_name = Postgres::Vacuum::Compatibility.pre_rails_6_1? ? connection_pool.spec.config[:database] : connection_pool.db_config.configuration_hash[:database]
+
             # activerecord allocates a connection pool per call to establish_connection
             # multiple pools might interact with the same database so we use the
             # database name to dedup

lib/postgres/vacuum/monitor.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'postgres/vacuum/compatibility'
 require 'postgres/vacuum/configuration'
 require 'postgres/vacuum/monitor/version'
 require 'postgres/vacuum/monitor/query'

postgres-vacuum-monitor.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls_reborn', '>= 0.18.0'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'salsify_rubocop'
 
-  spec.add_dependency 'activerecord', '>= 5', '< 6.1'
+  spec.add_dependency 'activerecord', '< 6.2.0'
   spec.add_dependency 'pg', '>= 0.18', '< 2.0'
 end

spec/postgres/vacuum/jobs/monitor_job_spec.rb

@@ -157,7 +157,11 @@ class SecondPool < ActiveRecord::Base
           let(:name_change_db_config) { { name: 'my db' } }
 
           before do
-            allow(SecondPool.connection_pool.spec).to receive(:config).and_return(name_change_db_config)
+            if Postgres::Vacuum::Compatibility.pre_rails_6_1?
+              allow(SecondPool.connection_pool.spec).to receive(:config).and_return(name_change_db_config)
+            else
+              allow(SecondPool.connection_pool.db_config).to receive(:configuration_hash).and_return(name_change_db_config)
+            end
           end
 
           it "reports twice for two databases" do