kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #34349 from yahonda/restore_encoding_utf8mb4

Browse source 
Restore `encoding: utf8mb4` in database.yml
This commit is contained in:
Ryuta Kamizono 2018-10-30 22:12:45 +09:00 committed by GitHub
commit 405aef3ded
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
guides/source/configuring.md
View file

@ -1011,6 +1011,7 @@ If you choose to use MySQL or MariaDB instead of the shipped SQLite3 database, y
```yaml ```yaml
development: development:
adapter: mysql2 adapter: mysql2
encoding: utf8mb4
database: blog_development database: blog_development
pool: 5 pool: 5
username: root username: root

1
railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt
View file

@ -11,6 +11,7 @@
# #
default: &default default: &default
adapter: mysql2 adapter: mysql2
encoding: utf8mb4
pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
username: root username: root
password: password: