Skip to content

Commit

Permalink
Revert from trilogy as it seems to have issues
Browse files Browse the repository at this point in the history
  • Loading branch information
fidel committed Oct 12, 2023
1 parent 7ac6feb commit 9d33419
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
MYSQL_ROOT_PASSWORD: secret
env:
RAILS_ENV: test
DATABASE_URL: "trilogy://root:secret@127.0.0.1:3306/payments_sample_test?pool=5"
DATABASE_URL: "mysql2://root:secret@127.0.0.1:3306/payments_sample_test?pool=5"
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
MYSQL_ROOT_PASSWORD: secret
env:
RAILS_ENV: test
DATABASE_URL: "trilogy://root:secret@127.0.0.1:3306/payments_sample_test?pool=5"
DATABASE_URL: "mysql2://root:secret@127.0.0.1:3306/payments_sample_test?pool=5"
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"

gem "rails", "~> 7.1.0"
gem "sprockets-rails"
gem "trilogy", "~> 2.4"
gem "mysql2"
gem "puma", ">= 5.0"
gem "importmap-rails"
gem "turbo-rails"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ GEM
minitest (~> 5.11)
mutant (= 0.11.22)
mutex_m (0.1.2)
mysql2 (0.5.5)
net-imap (0.4.1)
date
net-protocol
Expand Down Expand Up @@ -274,7 +275,6 @@ GEM
railties (>= 6.0.0)
thor (1.2.2)
timeout (0.4.0)
trilogy (2.6.0)
turbo-rails (1.5.0)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
Expand Down Expand Up @@ -313,6 +313,7 @@ DEPENDENCIES
mutant (= 0.11.22)
mutant-license!
mutant-minitest (= 0.11.22)
mysql2
puma (>= 5.0)
rails (~> 7.1.0)
rails_event_store (~> 2.12.1)
Expand All @@ -321,7 +322,6 @@ DEPENDENCIES
sprockets-rails
stimulus-rails
tailwindcss-rails
trilogy (~> 2.4)
turbo-rails
tzinfo-data
web-console
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: trilogy
adapter: mysql2
encoding: utf8mb4
pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: root
Expand Down

0 comments on commit 9d33419

Please sign in to comment.