Skip to content

Commit

Permalink
Reverting to mysql2
Browse files Browse the repository at this point in the history
  • Loading branch information
louispt1 committed Dec 12, 2024
1 parent 4db1753 commit 572e555
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -516,6 +516,7 @@ DEPENDENCIES
jwt
listen
local_time
mysql2 (~> 0.5.6)
pagy
puma (>= 5.0)
rack-cors
Expand All @@ -532,7 +533,6 @@ DEPENDENCIES
sprockets-rails
stimulus-rails
tailwindcss-rails (~> 3.0)
trilogy
turbo-rails
tzinfo-data
view_component
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
@@ -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') %>
Expand Down

0 comments on commit 572e555

Please sign in to comment.