Merge pull request #168 from zendesk/nony--work-with-both-adapters

Allow working with Mysql2 and Trilogy at same time, release v4.2.0

Author: HeyNonster

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
 
   tests:
     runs-on: ubuntu-latest
-    name: Test ${{ matrix.gemfile }} with Ruby ${{ matrix.ruby-version }}
+    name: Test ${{ matrix.gemfile }} with Ruby ${{ matrix.ruby-version }} & ${{ matrix.adapter_mysql }}
     services:
       mysql:
         image: mysql:8.0
@@ -36,17 +36,18 @@ jobs:
           - "3.3"
           - "3.4"
         gemfile:
-          - rails7.1_mysql2
-          - rails7.1_trilogy
-          - rails7.2_mysql2
-          - rails7.2_trilogy
-          - rails8.0_mysql2
-          - rails8.0_trilogy
+          - rails7.1
+          - rails7.2
+          - rails8.0
+        adapter_mysql:
+          - "mysql2"
+          - "trilogy"
         include:
-          - {ruby-version: "3.4", gemfile: "rails_main_mysql2"}
-          - {ruby-version: "3.4", gemfile: "rails_main_trilogy"}
+          - {ruby-version: "3.4", gemfile: "rails_main", adapter_mysql: "mysql2"}
+          - {ruby-version: "3.4", gemfile: "rails_main", adapter_mysql: "trilogy"}
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      TEST_ADAPTER_MYSQL: ${{ matrix.adapter_mysql }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby, Bundler and gems

.github/workflows/rails_main_testing.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    name: Test ${{ matrix.gemfile }} with Ruby ${{ matrix.ruby-version }}
+    name: Test ${{ matrix.gemfile }} with Ruby ${{ matrix.ruby-version }} & ${{ matrix.adapter_mysql }}
     services:
       mysql:
         image: mysql:8.0
@@ -26,9 +26,12 @@ jobs:
       matrix:
         gemfile:
           - "rails_main_mysql2"
-          - "rails_main_trilogy"
+        adapter_mysql:
+          - "mysql2"
+          - "trilogy"
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      TEST_ADAPTER_MYSQL: ${{ matrix.adapter_mysql }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby, Bundler and gems

Changelog.md

@@ -6,6 +6,11 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
+## [4.2.0]
+
+### Changed
+- ActiveRecordHostPool can now work with `mysql2` and `trilogy` if both gems are loaded.
+
 ### Added
 - Testing with Rails 8.0.
 

Gemfile

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-eval_gemfile "gemfiles/rails7.1_mysql2.gemfile"
+eval_gemfile "gemfiles/rails7.1.gemfile"

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_record_host_pool (4.1.0)
+    active_record_host_pool (4.2.0)
       activerecord (>= 7.1.0)
 
 GEM
@@ -97,6 +97,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop-performance (~> 1.22.0)
     timeout (0.4.3)
+    trilogy (2.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
@@ -112,11 +113,12 @@ DEPENDENCIES
   minitest-fail-fast
   minitest-line
   minitest-mock_expectations
-  mysql2 (~> 0.5)
+  mysql2
   phenix (>= 1.0.1)
   pry-byebug (~> 3.9)
   rake (>= 12.0.0)
   standard
+  trilogy (>= 2.5.0)
 
 BUNDLED WITH
    2.6.8

gemfiles/common.rb

@@ -8,3 +8,6 @@
 gem "pry-byebug", "~> 3.9"
 gem "rake", ">= 12.0.0"
 gem "standard"
+
+gem "mysql2"
+gem "trilogy", ">= 2.5.0"

gemfiles/rails7.1_mysql2.gemfile gemfiles/rails7.1.gemfilegemfiles/rails7.1_mysql2.gemfile renamed to gemfiles/rails7.1.gemfile

@@ -5,6 +5,5 @@ source "https://rubygems.org"
 gemspec path: "../"
 
 gem "activerecord", "~> 7.1.0"
-gem "mysql2", "~> 0.5"
 
 eval_gemfile "common.rb"

gemfiles/rails7.1_trilogy.gemfile.lock gemfiles/rails7.1.gemfile.lockgemfiles/rails7.1_trilogy.gemfile.lock renamed to gemfiles/rails7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (4.1.0)
+    active_record_host_pool (4.2.0)
       activerecord (>= 7.1.0)
 
 GEM
@@ -49,6 +49,7 @@ GEM
       minitest (~> 5.0)
     minitest-mock_expectations (1.2.0)
     mutex_m (0.3.0)
+    mysql2 (0.5.6)
     parallel (1.26.3)
     parser (3.3.6.0)
       ast (~> 2.4.1)
@@ -111,6 +112,7 @@ DEPENDENCIES
   minitest-fail-fast
   minitest-line
   minitest-mock_expectations
+  mysql2
   phenix (>= 1.0.1)
   pry-byebug (~> 3.9)
   rake (>= 12.0.0)