Try Support ActiveRecord 7.1.Z

.github/workflows/test_ruby_3_0.yml

@@ -1,14 +1,14 @@
-name: Exec Rspec
-run-name: Matrix building for ruby 3.0 ✖️ 【rails 6.0 - 6.1】 🚀
+name: Exec Rspec (Ruby 3.0)
+run-name: Matrix building for ruby 3.0 ✖️ 【rails 7.x】 🚀
 on: [push]
 
 jobs:
   ruby_3_0:
     strategy:
       fail-fast: false
       matrix:
-        arversion: ['6_0_6',
-                    '6_1_0', '6_1_1', '6_1_2', '6_1_3', '6_1_4', '6_1_5', '6_1_6', '6_1_7']
+        arversion: ['7_0_6', '7_0_7', '7_0_8',
+                    '7_1_2', '7_1_3', '7_1_4']
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile

.github/workflows/test_ruby_3_0_trilogy.yml

@@ -1,13 +1,13 @@
-name: Exec Rspec
-run-name: Matrix building for ruby 3.0 ✖️ 【rails 6.0】✖️ Trilogy 🚀
+name: Exec Rspec (Ruby 3.0 + Trilogy)
+run-name: Matrix building for ruby 3.0 ✖️ 【rails 7.x】✖️ Trilogy 🚀
 on: [push]
 
 jobs:
   ruby_3_0:
     strategy:
       fail-fast: false
       matrix:
-        arversion: ['6_0_6_trilogy', '6_1_7_trilogy']
+        arversion: ['7_0_8_trilogy', '7_1_4_trilogy']
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile

.github/workflows/test_ruby_3_2.yml

@@ -1,13 +1,14 @@
-name: Exec Rspec
-run-name: Matrix building for ruby 3.2 ✖️ 【rails 6.1】 🚀
+name: Exec Rspec (Ruby 3.2)
+run-name: Matrix building for ruby 3.2 ✖️ 【rails 7.x】 🚀
 on: [push]
 
 jobs:
   ruby_3_2:
     strategy:
       fail-fast: false
       matrix:
-        arversion: ['6_1_0', '6_1_1', '6_1_2', '6_1_3', '6_1_4', '6_1_5', '6_1_6', '6_1_7']
+        arversion: ['7_0_6', '7_0_7', '7_0_8',
+                    '7_1_2', '7_1_3', '7_1_4']
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile

.github/workflows/test_ruby_3_2_trilogy.yml

@@ -1,13 +1,13 @@
-name: Exec Rspec
-run-name: Matrix building for ruby 3.2 ✖️ 【rails 6.1】✖️ Trilogy 🚀
+name: Exec Rspec (Ruby 3.2 + Trilogy)
+run-name: Matrix building for ruby 3.2 ✖️ 【rails 7.x】✖️ Trilogy 🚀
 on: [push]
 
 jobs:
-  ruby_3_0:
+  ruby_3_2:
     strategy:
       fail-fast: false
       matrix:
-        arversion: ['6_0_6_trilogy', '6_1_7_trilogy']
+        arversion: ['7_0_8_trilogy', '7_1_4_trilogy']
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile

.github/workflows/test_ruby_2_7.yml → .github/workflows/test_ruby_3_3.yml

@@ -1,17 +1,14 @@
-name: Exec Rspec
-run-name: Matrix building for ruby 2.7 ✖️ 【rails 5.0 - 6.1】 🚀
+name: Exec Rspec (Ruby 3.3)
+run-name: Matrix building for ruby 3.3 ✖️ 【rails 7.x】 🚀
 on: [push]
 
 jobs:
-  ruby_2_7:
+  ruby_3_3:
     strategy:
       fail-fast: false
       matrix:
-        arversion: ['5_0_5', '5_0_6', '5_0_7',
-                    '5_1_3', '5_1_4', '5_1_5', '5_1_6', '5_1_7',
-                    '5_2_0', '5_2_1', '5_2_2', '5_2_3', '5_2_4', '5_2_5', '5_2_6', '5_2_7', '5_2_8',
-                    '6_0_0', '6_0_1', '6_0_2', '6_0_3', '6_0_4', '6_0_5', '6_0_6',
-                    '6_1_0', '6_1_1', '6_1_2', '6_1_3', '6_1_4', '6_1_5', '6_1_6', '6_1_7']
+        arversion: ['7_0_6', '7_0_7', '7_0_8',
+                    '7_1_2', '7_1_3', '7_1_4']
     runs-on: ubuntu-22.04
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile
@@ -22,7 +19,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.3'
           bundler: latest
           bundler-cache: true
       - name: Start mysql

.github/workflows/test_ruby_3_3_trilogy.yml

@@ -0,0 +1,33 @@
+name: Exec Rspec (Ruby 3.3 + Trilogy)
+run-name: Matrix building for ruby 3.3 ✖️ 【rails 7.x】✖️ Trilogy 🚀
+on: [push]
+
+jobs:
+  ruby_3_3:
+    strategy:
+      fail-fast: false
+      matrix:
+        arversion: ['7_0_8_trilogy', '7_1_4_trilogy']
+    runs-on: ubuntu-22.04
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails${{ matrix.arversion }}.gemfile
+      MYSQL_PWD: root
+      DATABASE_ADAPTER: trilogy
+      DATABASE_PASSWORD: root
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler: latest
+          bundler-cache: true
+      - name: Start mysql
+        run: |
+          sudo systemctl start mysql.service
+          mysql -h 127.0.0.1 --port 3306 -u root --password=root -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';"
+      - name: Reset DB
+        run: bundle exec rake turntable:db:reset
+      - name: Run RSpec
+        run: RUBYOPT='-W:deprecated' bundle exec rake spec

Appraisals

@@ -1,152 +1,75 @@
-appraise "rails6_0_0" do
-  gem "rails", "6.0.0"
-  gem "railties", "6.0.0"
-  gem "activerecord", "6.0.0"
-  gem "activesupport", "6.0.0"
-  gem "actionview", "6.0.0"
+appraise "rails7_0_6" do
+  gem "rails", "~> 7.0.6.0"
+  gem "railties", "~> 7.0.6.0"
+  gem "activerecord", "~> 7.0.6.0"
+  gem "activesupport", "~> 7.0.6.0"
+  gem "actionview", "~> 7.0.6.0"
   gem "mysql2", "~> 0.5.2"
+  gem "concurrent-ruby", "< 1.3.5"
 end
 
-appraise "rails6_0_1" do
-  gem "rails", "6.0.1"
-  gem "railties", "6.0.1"
-  gem "activerecord", "6.0.1"
-  gem "activesupport", "6.0.1"
-  gem "actionview", "6.0.1"
+appraise "rails7_0_7" do
+  gem "rails", "~> 7.0.7.0"
+  gem "railties", "~> 7.0.7.0"
+  gem "activerecord", "~> 7.0.7.0"
+  gem "activesupport", "~> 7.0.7.0"
+  gem "actionview", "~> 7.0.7.0"
   gem "mysql2", "~> 0.5.2"
+  gem "concurrent-ruby", "< 1.3.5"
 end
 
-appraise "rails6_0_2" do
-  gem "rails", "6.0.2"
-  gem "railties", "6.0.2"
-  gem "activerecord", "6.0.2"
-  gem "activesupport", "6.0.2"
-  gem "actionview", "6.0.2"
+appraise "rails7_0_8" do
+  gem "rails", "~> 7.0.8.0"
+  gem "railties", "~> 7.0.8.0"
+  gem "activerecord", "~> 7.0.8.0"
+  gem "activesupport", "~> 7.0.8.0"
+  gem "actionview", "~> 7.0.8.0"
   gem "mysql2", "~> 0.5.2"
+  gem "concurrent-ruby", "< 1.3.5"
 end
 
-appraise "rails6_0_3" do
-  gem "rails", "6.0.3"
-  gem "railties", "6.0.3"
-  gem "activerecord", "6.0.3"
-  gem "activesupport", "6.0.3"
-  gem "actionview", "6.0.3"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_0_4" do
-  gem "rails", "6.0.4"
-  gem "railties", "6.0.4"
-  gem "activerecord", "6.0.4"
-  gem "activesupport", "6.0.4"
-  gem "actionview", "6.0.4"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_0_5" do
-  gem "rails", "6.0.5"
-  gem "railties", "6.0.5"
-  gem "activerecord", "6.0.5"
-  gem "activesupport", "6.0.5"
-  gem "actionview", "6.0.5"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_0_6" do
-  gem "rails", "~> 6.0.6.1"
-  gem "railties", "~> 6.0.6.1"
-  gem "activerecord", "~> 6.0.6.1"
-  gem "activesupport", "~> 6.0.6.1"
-  gem "actionview", "~> 6.0.6.1"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_0_6_trilogy" do
-  gem "rails", "~> 6.0.6.1"
-  gem "railties", "~> 6.0.6.1"
-  gem "activerecord", "~> 6.0.6.1"
+appraise "rails7_0_8_trilogy" do
+  gem "rails", "~> 7.0.8.0"
+  gem "railties", "~> 7.0.8.0"
+  gem "activerecord", "~> 7.0.8.0"
   gem "activerecord-trilogy-adapter", "~> 3.1.2"
-  gem "activesupport", "~> 6.0.6.1"
-  gem "actionview", "~> 6.0.6.1"
+  gem "activesupport", "~> 7.0.8.0"
+  gem "actionview", "~> 7.0.8.0"
+  gem "concurrent-ruby", "< 1.3.5"
 end
 
-appraise "rails6_1_0" do
-  gem "rails", "~> 6.1.0.0"
-  gem "railties", "~> 6.1.0.0"
-  gem "activerecord", "~> 6.1.0.0"
-  gem "activesupport", "~> 6.1.0.0"
-  gem "actionview", "~> 6.1.0.0"
+appraise "rails7_1_2" do
+  gem "rails", "~> 7.1.2.0"
+  gem "railties", "~> 7.1.2.0"
+  gem "activerecord", "~> 7.1.2.0"
+  gem "activesupport", "~> 7.1.2.0"
+  gem "actionview", "~> 7.1.2.0"
   gem "mysql2", "~> 0.5.2"
 end
 
-appraise "rails6_1_1" do
-  gem "rails", "~> 6.1.1.0"
-  gem "railties", "~> 6.1.1.0"
-  gem "activerecord", "~> 6.1.1.0"
-  gem "activesupport", "~> 6.1.1.0"
-  gem "actionview", "~> 6.1.1.0"
+appraise "rails7_1_3" do
+  gem "rails", "~> 7.1.3.0"
+  gem "railties", "~> 7.1.3.0"
+  gem "activerecord", "~> 7.1.3.0"
+  gem "activesupport", "~> 7.1.3.0"
+  gem "actionview", "~> 7.1.3.0"
   gem "mysql2", "~> 0.5.2"
 end
 
-appraise "rails6_1_2" do
-  gem "rails", "~> 6.1.2.0"
-  gem "railties", "~> 6.1.2.0"
-  gem "activerecord", "~> 6.1.2.0"
-  gem "activesupport", "~> 6.1.2.0"
-  gem "actionview", "~> 6.1.2.0"
+appraise "rails7_1_4" do
+  gem "rails", "~> 7.1.4.0"
+  gem "railties", "~> 7.1.4.0"
+  gem "activerecord", "~> 7.1.4.0"
+  gem "activesupport", "~> 7.1.4.0"
+  gem "actionview", "~> 7.1.4.0"
   gem "mysql2", "~> 0.5.2"
 end
 
-appraise "rails6_1_3" do
-  gem "rails", "~> 6.1.3.0"
-  gem "railties", "~> 6.1.3.0"
-  gem "activerecord", "~> 6.1.3.0"
-  gem "activesupport", "~> 6.1.3.0"
-  gem "actionview", "~> 6.1.3.0"
-  gem "mysql2", "~> 0.5.2"
+appraise "rails7_1_4_trilogy" do
+  gem "rails", "~> 7.1.4.0"
+  gem "railties", "~> 7.1.4.0"
+  gem "activerecord", "~> 7.1.4.0"
+  gem "activesupport", "~> 7.1.4.0"
+  gem "actionview", "~> 7.1.4.0"
+  gem "trilogy", "~> 2.8.1"
 end
-
-appraise "rails6_1_4" do
-  gem "rails", "~> 6.1.4.0"
-  gem "railties", "~> 6.1.4.0"
-  gem "activerecord", "~> 6.1.4.0"
-  gem "activesupport", "~> 6.1.4.0"
-  gem "actionview", "~> 6.1.4.0"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_1_5" do
-  gem "rails", "~> 6.1.5.0"
-  gem "railties", "~> 6.1.5.0"
-  gem "activerecord", "~> 6.1.5.0"
-  gem "activesupport", "~> 6.1.5.0"
-  gem "actionview", "~> 6.1.5.0"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_1_6" do
-  gem "rails", "~> 6.1.6.0"
-  gem "railties", "~> 6.1.6.0"
-  gem "activerecord", "~> 6.1.6.0"
-  gem "activesupport", "~> 6.1.6.0"
-  gem "actionview", "~> 6.1.6.0"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_1_7" do
-  gem "rails", "~> 6.1.7.0"
-  gem "railties", "~> 6.1.7.0"
-  gem "activerecord", "~> 6.1.7.0"
-  gem "activesupport", "~> 6.1.7.0"
-  gem "actionview", "~> 6.1.7.0"
-  gem "mysql2", "~> 0.5.2"
-end
-
-appraise "rails6_1_7_trilogy" do
-  gem "rails", "~> 6.1.7.0"
-  gem "railties", "~> 6.1.7.0"
-  gem "activerecord", "~> 6.1.7.0"
-  gem "activerecord-trilogy-adapter", "~> 3.1.2"
-  gem "activesupport", "~> 6.1.7.0"
-  gem "actionview", "~> 6.1.7.0"
-end

Gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", "6.1.7.7"
+gem "rails", "7.0.8.4"
 
-gem "actionview", "6.1.7.7"
-gem "activerecord", "6.1.7.7"
-gem "activesupport", "6.1.7.7"
+gem "actionview", "7.0.8.4"
+gem "activerecord", "7.0.8.4"
+gem "activesupport", "7.0.8.4"

Rakefile

@@ -9,7 +9,7 @@ end
 
 require "active_record"
 ActiveSupport.on_load(:active_record) do
-  if ENV["DATABASE_ADAPTER"] == "trilogy"
+  if ENV["DATABASE_ADAPTER"] == "trilogy" && !ActiveRecord::Turntable::Util.ar71_or_later?
     require "trilogy_adapter/connection"
     ActiveRecord::Base.public_send :extend, TrilogyAdapter::Connection
   end
@@ -49,7 +49,7 @@ namespace :turntable do
       ActiveRecord::Base.include(ActiveRecord::Turntable)
       ActiveRecord::ConnectionAdapters::SchemaStatements.include(ActiveRecord::Turntable::Migration::SchemaStatementsExt)
 
-      configurations = [ActiveRecord::Base.configurations[RAILS_ENV]]
+      configurations = ActiveRecord::Base.configurations.configs_for(env_name: RAILS_ENV)
       configurations += ActiveRecord::Tasks::DatabaseTasks.current_turntable_cluster_configurations(RAILS_ENV).map { |v| v[1] }.flatten.uniq
 
       configurations.each do |configuration|