Swap to trilogy for MySQL CI

excid3 · Jan 31, 2024 · 7bfb4bf · 7bfb4bf
1 parent 3fd064f
commit 7bfb4bf
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,7 +92,7 @@ jobs:
 
       - name: Run tests
         env:
-          DATABASE_URL: mysql2://root:password@127.0.0.1:3306/test
+          DATABASE_URL: trilogy://root:password@127.0.0.1:3306/test
           RAILS_ENV: test
         run: |
           bundle exec rails db:test:prepare

diff --git a/Appraisals b/Appraisals
@@ -1,9 +1,11 @@
 appraise "rails-6-1" do
   gem "rails", "~> 6.1.0"
+  gem "activerecord-trilogy-adapter"
 end
 
 appraise "rails-7" do
   gem "rails", "~> 7.0.0"
+  gem "activerecord-trilogy-adapter"
 end
 
 appraise "rails-7-1" do

diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,6 @@ gem "standard"
 gem "webmock"
 
 gem "pg"
-gem "mysql2"
 gem "sqlite3"
 
 # To use a debugger

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -145,7 +145,6 @@ GEM
     minitest (5.21.2)
     multi_json (1.15.0)
     mutex_m (0.2.0)
-    mysql2 (0.5.5)
     net-http (0.4.1)
       uri
     net-http2 (0.18.5)
@@ -288,7 +287,6 @@ DEPENDENCIES
   appraisal
   byebug
   googleauth (~> 1.1)
-  mysql2
   net-smtp
   noticed!
   pg

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -5,13 +5,13 @@ source "https://rubygems.org"
 gem "standard"
 gem "webmock"
 gem "pg"
-gem "mysql2"
 gem "sqlite3"
 gem "byebug", group: [:development, :test]
 gem "appraisal"
 gem "net-smtp"
 gem "apnotic", "~> 1.7"
 gem "googleauth", "~> 1.1"
 gem "rails", "~> 6.1.0"
+gem "activerecord-trilogy-adapter"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6_1.gemfile.lock b/gemfiles/rails_6_1.gemfile.lock
@@ -53,6 +53,9 @@ GEM
     activerecord (6.1.7.6)
       activemodel (= 6.1.7.6)
       activesupport (= 6.1.7.6)
+    activerecord-trilogy-adapter (3.1.2)
+      activerecord (>= 6.0.a, < 7.1.a)
+      trilogy (>= 2.4.0)
     activestorage (6.1.7.6)
       actionpack (= 6.1.7.6)
       activejob (= 6.1.7.6)
@@ -123,7 +126,6 @@ GEM
     mini_mime (1.1.5)
     minitest (5.21.2)
     multi_json (1.15.0)
-    mysql2 (0.5.5)
     net-http (0.4.1)
       uri
     net-http2 (0.18.5)
@@ -233,6 +235,7 @@ GEM
       rubocop-performance (~> 1.20.2)
     thor (1.3.0)
     timeout (0.4.1)
+    trilogy (2.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -254,11 +257,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activerecord-trilogy-adapter
   apnotic (~> 1.7)
   appraisal
   byebug
   googleauth (~> 1.1)
-  mysql2
   net-smtp
   noticed!
   pg

diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile
@@ -5,13 +5,13 @@ source "https://rubygems.org"
 gem "standard"
 gem "webmock"
 gem "pg"
-gem "mysql2"
 gem "sqlite3"
 gem "byebug", group: [:development, :test]
 gem "appraisal"
 gem "net-smtp"
 gem "apnotic", "~> 1.7"
 gem "googleauth", "~> 1.1"
 gem "rails", "~> 7.0.0"
+gem "activerecord-trilogy-adapter"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.gemfile.lock b/gemfiles/rails_7.gemfile.lock
@@ -60,6 +60,9 @@ GEM
     activerecord (7.0.8)
       activemodel (= 7.0.8)
       activesupport (= 7.0.8)
+    activerecord-trilogy-adapter (3.1.2)
+      activerecord (>= 6.0.a, < 7.1.a)
+      trilogy (>= 2.4.0)
     activestorage (7.0.8)
       actionpack (= 7.0.8)
       activejob (= 7.0.8)
@@ -129,7 +132,6 @@ GEM
     mini_mime (1.1.5)
     minitest (5.21.2)
     multi_json (1.15.0)
-    mysql2 (0.5.5)
     net-http (0.4.1)
       uri
     net-http2 (0.18.5)
@@ -232,6 +234,7 @@ GEM
       rubocop-performance (~> 1.20.2)
     thor (1.3.0)
     timeout (0.4.1)
+    trilogy (2.7.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
@@ -253,11 +256,11 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  activerecord-trilogy-adapter
   apnotic (~> 1.7)
   appraisal
   byebug
   googleauth (~> 1.1)
-  mysql2
   net-smtp
   noticed!
   pg

diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "standard"
 gem "webmock"
 gem "pg"
-gem "mysql2"
 gem "sqlite3"
 gem "byebug", group: [:development, :test]
 gem "appraisal"

diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile
@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "standard"
 gem "webmock"
 gem "pg"
-gem "mysql2"
 gem "sqlite3"
 gem "byebug", group: [:development, :test]
 gem "appraisal"