Test Rails 7.0 with mysql2 and trilogy

Removes mysql2 as a direct dependency and creates two separate Rails 7.0 gemfiles, one with `mysql2`, one with `activerecord-trilogy-adapter`. Adds both gemfiles to CI to test each.
zendesk · Jun 19, 2023 · c139cec · c139cec
1 parent eec30dd
commit c139cec
Show file tree

Hide file tree

Showing 10 changed files with 116 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,8 @@ jobs:
           - "3.2"
         gemfile:
           - rails6.1
-          - rails7.0
+          - rails7.0_mysql2
+          - rails7.0_trilogy
         legacy_connection_handling:
           - "false"
           - "true"

diff --git a/active_record_host_pool.gemspec b/active_record_host_pool.gemspec
@@ -29,5 +29,4 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.7.0"
 
   s.add_runtime_dependency("activerecord", ">= 5.1.0", "< 7.1")
-  s.add_runtime_dependency("mysql2")
 end
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     active_record_host_pool (1.2.4)
       activerecord (>= 5.1.0, < 7.1)
-      mysql2
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     active_record_host_pool (1.2.4)
       activerecord (>= 5.1.0, < 7.1)
-      mysql2
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     active_record_host_pool (1.2.4)
       activerecord (>= 5.1.0, < 7.1)
-      mysql2
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -3,7 +3,6 @@ PATH
   specs:
     active_record_host_pool (1.2.4)
       activerecord (>= 5.1.0, < 7.1)
-      mysql2
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0.gemfile → gemfiles/rails7.0_mysql2.gemfile b/gemfiles/rails7.0.gemfile → gemfiles/rails7.0_mysql2.gemfile
diff --git a/gemfiles/rails7.0.gemfile.lock → gemfiles/rails7.0_mysql2.gemfile.lock b/gemfiles/rails7.0.gemfile.lock → gemfiles/rails7.0_mysql2.gemfile.lock
@@ -3,40 +3,40 @@ PATH
   specs:
     active_record_host_pool (1.2.4)
       activerecord (>= 5.1.0, < 7.1)
-      mysql2
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activerecord (7.0.4.3)
-      activemodel (= 7.0.4.3)
-      activesupport (= 7.0.4.3)
-    activesupport (7.0.4.3)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    i18n (1.12.0)
+    concurrent-ruby (1.2.2)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
+    jaro_winkler (1.5.6)
     method_source (1.0.0)
-    minitest (5.16.3)
+    minitest (5.18.1)
     minitest-fail-fast (0.1.0)
       minitest (~> 5)
     minitest-line (0.6.5)
       minitest (~> 5.0)
     minitest-mock_expectations (1.1.3)
     mysql2 (0.5.5)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    phenix (1.0.1)
+      racc
+    phenix (1.1.0)
       activerecord (>= 4.2, < 7.1)
       bundler
     pry (0.14.2)
@@ -45,6 +45,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rexml (3.2.5)
@@ -56,8 +57,8 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
+    ruby-progressbar (1.13.0)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.6.1)
 
@@ -79,4 +80,4 @@ DEPENDENCIES
   rubocop (~> 0.80.0)
 
 BUNDLED WITH
-   2.4.8
+   2.4.13
diff --git a/gemfiles/rails7.0_trilogy.gemfile b/gemfiles/rails7.0_trilogy.gemfile
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 7.0.0'
+gem 'activerecord-trilogy-adapter', '>= 3.0'
+
+eval_gemfile 'common.rb'
diff --git a/gemfiles/rails7.0_trilogy.gemfile.lock b/gemfiles/rails7.0_trilogy.gemfile.lock
@@ -0,0 +1,86 @@
+PATH
+  remote: ..
+  specs:
+    active_record_host_pool (1.2.4)
+      activerecord (>= 5.1.0, < 7.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activerecord-trilogy-adapter (3.0.0)
+      activerecord (>= 7.0, < 7.1a)
+      trilogy (>= 2.4.0)
+    activesupport (7.0.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.2)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.6)
+    method_source (1.0.0)
+    minitest (5.18.1)
+    minitest-fail-fast (0.1.0)
+      minitest (~> 5)
+    minitest-line (0.6.5)
+      minitest (~> 5.0)
+    minitest-mock_expectations (1.1.3)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    phenix (1.1.0)
+      activerecord (>= 4.2, < 7.1)
+      bundler
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.10.1)
+      byebug (~> 11.0)
+      pry (>= 0.13, < 0.15)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rexml (3.2.5)
+    rubocop (0.80.1)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rexml
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.13.0)
+    trilogy (2.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  active_record_host_pool!
+  activerecord (~> 7.0.0)
+  activerecord-trilogy-adapter (>= 3.0)
+  byebug
+  minitest (>= 5.10.0)
+  minitest-fail-fast
+  minitest-line
+  minitest-mock_expectations (~> 1.1.3)
+  phenix (>= 1.0.1)
+  pry-byebug (~> 3.9)
+  rake (>= 12.0.0)
+  rubocop (~> 0.80.0)
+
+BUNDLED WITH
+   2.4.13