Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rails] Revert to mysql2 gem for the MySQL adapter #9020

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frameworks/Ruby/rails/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ruby '~> 3.2'

source 'https://rubygems.org'

gem 'trilogy', group: :mysql
gem 'mysql2', '0.5.6', group: :mysql
gem 'oj', '~> 3.16'
gem 'pg', '1.5.4', group: :postgresql
gem 'puma', '~> 6.4'
Expand Down
4 changes: 2 additions & 2 deletions frameworks/Ruby/rails/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ GEM
mini_portile2 (2.8.5)
minitest (5.22.2)
mutex_m (0.2.0)
mysql2 (0.5.6)
net-imap (0.4.10)
date
net-protocol
Expand Down Expand Up @@ -180,7 +181,6 @@ GEM
stringio (3.1.0)
thor (1.3.1)
timeout (0.4.1)
trilogy (2.6.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.5)
Expand All @@ -197,12 +197,12 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
mysql2 (= 0.5.6)
oj (~> 3.16)
pg (= 1.5.4)
puma (~> 6.4)
rails (~> 7.1.3)
redis (~> 5.0)
trilogy
tzinfo-data

RUBY VERSION
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Ruby/rails/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test:

production_mysql:
<<: *default
adapter: trilogy
adapter: mysql2

production_postgresql:
<<: *default
Expand Down
2 changes: 1 addition & 1 deletion frameworks/Ruby/rails/rails.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
COPY ./Gemfile* /rails/

ENV BUNDLE_FORCE_RUBY_PLATFORM=true
ENV BUNDLE_WITHOUT=trilogy
ENV BUNDLE_WITHOUT=mysql
RUN bundle install --jobs=8

COPY . /rails/
Expand Down
Loading