From 64dd973f535a6091856fbd21873b252dc900e9dd Mon Sep 17 00:00:00 2001 From: Sammy Larbi Date: Fri, 11 Dec 2020 11:23:50 -0600 Subject: [PATCH 1/3] Allow use with Rails 6.1 --- apartment.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apartment.gemspec b/apartment.gemspec index eb59070f..9653b23e 100644 --- a/apartment.gemspec +++ b/apartment.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.licenses = ["MIT"] # must be >= 3.1.2 due to bug in prepared_statements - s.add_dependency 'activerecord', '>= 3.1.2', '< 6.1' + s.add_dependency 'activerecord', '>= 3.1.2', '< 6.2' s.add_dependency 'rack', '>= 1.3.6' s.add_dependency 'public_suffix', '>= 2' s.add_dependency 'parallel', '>= 0.7.1' From 2de015b19c8bb945884a607c2f3d2bff56f8f880 Mon Sep 17 00:00:00 2001 From: Sammy Larbi Date: Wed, 10 Mar 2021 12:19:06 -0600 Subject: [PATCH 2/3] Remove Rails 6.1 Deprecation notice by switching to new method for connection_config --- lib/apartment.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/apartment.rb b/lib/apartment.rb index b20a7728..5bdc5aa0 100644 --- a/lib/apartment.rb +++ b/lib/apartment.rb @@ -16,7 +16,15 @@ class << self attr_accessor(*ACCESSOR_METHODS) attr_writer(*WRITER_METHODS) - def_delegators :connection_class, :connection, :connection_config, :establish_connection + def_delegators :connection_class, :connection, :establish_connection + + def connection_config + if ::ActiveRecord::Base.respond_to?(:connection_db_config) + ::ActiveRecord::Base.connection_db_config.configuration_hash + else + ::ActiveRecord::Base.connection_config + end + end # configure apartment with available options def configure From 4a4d28c5b97bf86cc419a93bb5c19e950def4c4e Mon Sep 17 00:00:00 2001 From: Sammy Larbi Date: Mon, 20 Dec 2021 16:06:29 -0600 Subject: [PATCH 3/3] Allow use with Rails version 7+ lower than Rails 8 --- apartment.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apartment.gemspec b/apartment.gemspec index 9653b23e..68d202c0 100644 --- a/apartment.gemspec +++ b/apartment.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.licenses = ["MIT"] # must be >= 3.1.2 due to bug in prepared_statements - s.add_dependency 'activerecord', '>= 3.1.2', '< 6.2' + s.add_dependency 'activerecord', '>= 3.1.2', '< 8.0' s.add_dependency 'rack', '>= 1.3.6' s.add_dependency 'public_suffix', '>= 2' s.add_dependency 'parallel', '>= 0.7.1'