Skip to content

Commit 5a1c911

Browse files
committed
Switch to trilogy instead of mysql2 adapter
1 parent cf08a3c commit 5a1c911

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ ruby '3.2.2'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
77
gem 'rails', '~> 6.1.4'
8-
# Use mysql as the database for Active Record
9-
gem 'mysql2', '>= 0.4.4'
8+
# Use trilogy as the database for Active Record
9+
gem "activerecord-trilogy-adapter"
1010
# Use Puma as the app server
1111
gem 'puma', '~> 5.6.2'
1212
# Use SCSS for stylesheets

Gemfile.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ GEM
4949
activerecord (6.1.7.6)
5050
activemodel (= 6.1.7.6)
5151
activesupport (= 6.1.7.6)
52+
activerecord-trilogy-adapter (3.1.2)
53+
activerecord (>= 6.0.a, < 7.1.a)
54+
trilogy (>= 2.4.0)
5255
activestorage (6.1.7.6)
5356
actionpack (= 6.1.7.6)
5457
activejob (= 6.1.7.6)
@@ -208,7 +211,6 @@ GEM
208211
minitest (5.20.0)
209212
msgpack (1.7.2)
210213
multi_xml (0.6.0)
211-
mysql2 (0.5.5)
212214
nenv (0.3.0)
213215
net-imap (0.3.7)
214216
date
@@ -378,6 +380,7 @@ GEM
378380
thor (1.2.2)
379381
tilt (2.3.0)
380382
timeout (0.4.0)
383+
trilogy (2.6.0)
381384
tzinfo (2.0.6)
382385
concurrent-ruby (~> 1.0)
383386
unicode-display_width (2.5.0)
@@ -412,6 +415,7 @@ PLATFORMS
412415

413416
DEPENDENCIES
414417
aasm
418+
activerecord-trilogy-adapter
415419
amazing_print
416420
bcrypt_pbkdf (>= 1.0, < 2.0)
417421
bootsnap (>= 1.4.2)
@@ -436,7 +440,6 @@ DEPENDENCIES
436440
listen (>= 3.0.8, < 3.2)
437441
meilisearch-rails
438442
mini_magick
439-
mysql2 (>= 0.4.4)
440443
psych (< 4)
441444
puma (~> 5.6.2)
442445
rails (~> 6.1.4)

config/database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
1111
#
1212
default: &default
13-
adapter: mysql2
13+
adapter: trilogy
1414
encoding: utf8mb4
1515
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
1616
username: root

0 commit comments

Comments
 (0)