Skip to content

Commit

Permalink
Switch to trilogy instead of mysql2 adapter
Browse files Browse the repository at this point in the history
  • Loading branch information
jschwindt committed Oct 9, 2023
1 parent cf08a3c commit 5a1c911
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1.4'
# Use mysql as the database for Active Record
gem 'mysql2', '>= 0.4.4'
# Use trilogy as the database for Active Record
gem "activerecord-trilogy-adapter"
# Use Puma as the app server
gem 'puma', '~> 5.6.2'
# Use SCSS for stylesheets
Expand Down
7 changes: 5 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,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)
Expand Down Expand Up @@ -208,7 +211,6 @@ GEM
minitest (5.20.0)
msgpack (1.7.2)
multi_xml (0.6.0)
mysql2 (0.5.5)
nenv (0.3.0)
net-imap (0.3.7)
date
Expand Down Expand Up @@ -378,6 +380,7 @@ GEM
thor (1.2.2)
tilt (2.3.0)
timeout (0.4.0)
trilogy (2.6.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
Expand Down Expand Up @@ -412,6 +415,7 @@ PLATFORMS

DEPENDENCIES
aasm
activerecord-trilogy-adapter
amazing_print
bcrypt_pbkdf (>= 1.0, < 2.0)
bootsnap (>= 1.4.2)
Expand All @@ -436,7 +440,6 @@ DEPENDENCIES
listen (>= 3.0.8, < 3.2)
meilisearch-rails
mini_magick
mysql2 (>= 0.4.4)
psych (< 4)
puma (~> 5.6.2)
rails (~> 6.1.4)
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# https://dev.mysql.com/doc/refman/5.7/en/password-hashing.html
#
default: &default
adapter: mysql2
adapter: trilogy
encoding: utf8mb4
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: root
Expand Down

0 comments on commit 5a1c911

Please sign in to comment.