From 924b13da2b17a5d4351329ca5c705e341caaab06 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <seuros@commonshare.com>
Date: Sat, 14 Oct 2023 20:24:22 +0100
Subject: [PATCH] update gemfiles

---
 Appraisals                        | 8 +++++---
 gemfiles/activerecord_6.1.gemfile | 3 ++-
 gemfiles/activerecord_7.0.gemfile | 3 ++-
 gemfiles/activerecord_7.1.gemfile | 2 +-
 test/test_helper.rb               | 6 +-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Appraisals b/Appraisals
index efca6aa..b823851 100644
--- a/Appraisals
+++ b/Appraisals
@@ -2,21 +2,22 @@
 
 appraise 'activerecord-7.1' do
   gem 'activerecord', '~> 7.1.0'
+  gem 'trilogy'
   platforms :ruby do
     gem 'sqlite3'
     gem 'mysql2'
-    gem 'trilogy'
     gem 'pg'
   end
 end
 
 appraise 'activerecord-7.0' do
   gem 'activerecord', '~> 7.0.0'
+  gem 'trilogy'
+  gem "activerecord-trilogy-adapter"
   platforms :ruby do
     gem 'sqlite3'
     gem 'mysql2'
     gem 'pg'
-    gem "activerecord-trilogy-adapter"
   end
   platforms :jruby do
     gem "activerecord-jdbcmysql-adapter"
@@ -27,11 +28,12 @@ end
 
 appraise 'activerecord-6.1' do
   gem 'activerecord', '~> 6.1.0'
+  gem 'trilogy'
+  gem "activerecord-trilogy-adapter"
   platforms :ruby do
     gem 'sqlite3'
     gem 'mysql2'
     gem 'pg'
-    gem "activerecord-trilogy-adapter"
   end
   platforms :jruby do
     gem "activerecord-jdbcmysql-adapter"
diff --git a/gemfiles/activerecord_6.1.gemfile b/gemfiles/activerecord_6.1.gemfile
index 9df2a55..62fc711 100644
--- a/gemfiles/activerecord_6.1.gemfile
+++ b/gemfiles/activerecord_6.1.gemfile
@@ -3,12 +3,13 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
+gem "trilogy"
+gem "activerecord-trilogy-adapter"
 
 platforms :ruby do
   gem "sqlite3"
   gem "mysql2"
   gem "pg"
-  gem "activerecord-trilogy-adapter"
 end
 
 platforms :jruby do
diff --git a/gemfiles/activerecord_7.0.gemfile b/gemfiles/activerecord_7.0.gemfile
index 43ef3e3..0490f67 100644
--- a/gemfiles/activerecord_7.0.gemfile
+++ b/gemfiles/activerecord_7.0.gemfile
@@ -3,12 +3,13 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
+gem "trilogy"
+gem "activerecord-trilogy-adapter"
 
 platforms :ruby do
   gem "sqlite3"
   gem "mysql2"
   gem "pg"
-  gem "activerecord-trilogy-adapter"
 end
 
 platforms :jruby do
diff --git a/gemfiles/activerecord_7.1.gemfile b/gemfiles/activerecord_7.1.gemfile
index a9455ae..fe99fb4 100644
--- a/gemfiles/activerecord_7.1.gemfile
+++ b/gemfiles/activerecord_7.1.gemfile
@@ -3,11 +3,11 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.1.0"
+gem "trilogy"
 
 platforms :ruby do
   gem "sqlite3"
   gem "mysql2"
-  gem "trilogy"
   gem "pg"
 end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index dc3a6a5..262e7d6 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -18,11 +18,7 @@
 ActiveRecord::Base.establish_connection
 
 def env_db
-  @env_db ||= if ActiveRecord::Base.respond_to?(:connection_db_config)
-                ActiveRecord::Base.connection_db_config.adapter
-              else
-                ActiveRecord::Base.connection_config[:adapter]
-              end.to_sym
+  @env_db ||= ActiveRecord::Base.connection_db_config.adapter.to_sym
 end
 
 ActiveRecord::Migration.verbose = false