Merge branch 'main' into support_rails_7

.github/workflows/ci.yml

@@ -11,9 +11,11 @@ jobs:
         - "~>7.0.0"
         ruby_version:
         - '3.0'
+        - '3.1'
+        - '3.2'
       fail-fast: false
     runs-on: ubuntu-latest
-    name: Test on Rails ${{ matrix.rails_version }}
+    name: Test on Rails ${{ matrix.rails_version }} with Ruby ${{ matrix.ruby_version }}
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       DB_HOST: 127.0.0.1

CHANGELOG.md

@@ -9,6 +9,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 - Support Rails 7.0
 
+## 2.2.0
+
+### Changed
+
+- Bump minimum Trilogy version to 2.3.0. #32
+- Start using the new Trilogy 2.3.0 error classes. #24
+- Rely on the upstream `execute` method (which includes an `allow_retry` option). #12
+- Rely on the upstream `raw_execute` method (which includes a new warning feature). #29
+- Replace custom dbconsole patch with `TrilogyAdapter::Connection#trilogy_adapter_class`. #8
+
+### Fixed
+
+- Don't retain the old connection if reconnect fails. #13
+- Call `super` in `TrilogyAdapter#disconnect!` to ensure we properly reset state. #11
+
 ## 2.1.0
 
 ### Added

lib/trilogy_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TrilogyAdapter
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

test/lib/active_record/connection_adapters/trilogy_adapter_test.rb

@@ -187,7 +187,7 @@ class ActiveRecord::ConnectionAdapters::TrilogyAdapterTest < TestCase
     rescue ActiveRecord::StatementInvalid => ex
       assert_instance_of Trilogy::BaseError, ex.cause
     else
-      flunk "Expected Trilogy::Error to be raised"
+      flunk "Expected Trilogy::BaseError to be raised"
     end
 
     assert_nil adapter.send(:connection)