diff --git a/Gemfile b/Gemfile index b3fe9a3..2d44664 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem "rails", "~> 7.2.1" # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] gem "sprockets-rails" # Use mysql as the database for Active Record -gem "trilogy" +gem "mysql2", "~> 0.5.6" # Use the Puma web server [https://github.com/puma/puma] gem "puma", ">= 5.0" # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails] diff --git a/Gemfile.lock b/Gemfile.lock index e20b37f..aa36ba5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -258,6 +258,7 @@ GEM minitest (5.25.1) msgpack (1.7.3) multi_json (1.15.0) + mysql2 (0.5.6) net-http (0.4.1) uri net-imap (0.5.0) @@ -449,7 +450,6 @@ GEM thor (1.3.2) tilt (2.3.0) timeout (0.4.1) - trilogy (2.9.0) turbo-rails (2.0.11) actionpack (>= 6.0.0) railties (>= 6.0.0) @@ -516,6 +516,7 @@ DEPENDENCIES jwt listen local_time + mysql2 (~> 0.5.6) pagy puma (>= 5.0) rack-cors @@ -532,7 +533,6 @@ DEPENDENCIES sprockets-rails stimulus-rails tailwindcss-rails (~> 3.0) - trilogy turbo-rails tzinfo-data view_component diff --git a/config/database.yml b/config/database.yml index fc2dcaf..88e2281 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,5 +1,5 @@ default: &default - adapter: trilogy + adapter: mysql2 encoding: utf8mb4 pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> username: <%= ENV.fetch('MYSQL_USER', 'root') %>