diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-10-30 22:12:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 22:12:45 +0900 |
| commit | 405aef3dede8938c8eb9789f6d6722864faddb09 (patch) | |
| tree | 0a1ed78d2db9224621a33a55689af308babb673c | |
| parent | 9ae3ddbb21ece10550c8fd37e0c12bab9f5a89f8 (diff) | |
| parent | 639f8fd9e51e6aa0405ac8cebdced8abe9bedaf3 (diff) | |
| download | rails-405aef3dede8938c8eb9789f6d6722864faddb09.tar.gz rails-405aef3dede8938c8eb9789f6d6722864faddb09.tar.bz2 rails-405aef3dede8938c8eb9789f6d6722864faddb09.zip | |
Merge pull request #34349 from yahonda/restore_encoding_utf8mb4
Restore `encoding: utf8mb4` in database.yml
| -rw-r--r-- | guides/source/configuring.md | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 61bb35cf93..d03943ba4a 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -1011,6 +1011,7 @@ If you choose to use MySQL or MariaDB instead of the shipped SQLite3 database, y ```yaml development: adapter: mysql2 + encoding: utf8mb4 database: blog_development pool: 5 username: root diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt index 5860563908..b6c2e7448a 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml.tt @@ -11,6 +11,7 @@ # default: &default adapter: mysql2 + encoding: utf8mb4 pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> username: root password: |