aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorre4k <re4k@re4k.info>2013-05-06 03:39:31 +0900
committerre4k <re4k@re4k.info>2013-05-06 03:39:31 +0900
commitf5cb96795352731404ce4ea15e707ebcb55053a9 (patch)
tree2e19c866a56c3c8418d665695a7864721db6a334 /config
parentbb27f6f3f93339bbc300dea2bc82700554259544 (diff)
downloadaclog-f5cb96795352731404ce4ea15e707ebcb55053a9.tar.gz
comment out MySqlChangeCharset migration (not needed / may be harmful [?]) and add exmaple collation option to database.yml.example
Diffstat (limited to 'config')
-rw-r--r--config/database.yml.example3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/database.yml.example b/config/database.yml.example
index ab53f01..4688bc4 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -5,6 +5,7 @@ development:
password:
host: localhost
encoding: utf8mb4
+ collation: utf8mb4_general_ci
test:
adapter: mysql2
@@ -13,6 +14,7 @@ test:
password:
host: localhost
encoding: utf8mb4
+ collation: utf8mb4_general_ci
production:
adapter: mysql2
@@ -21,4 +23,5 @@ production:
password:
host: localhost
encoding: utf8mb4
+ collation: utf8mb4_general_ci