aboutsummaryrefslogtreecommitdiffstats
path: root/railties/configs
diff options
context:
space:
mode:
Diffstat (limited to 'railties/configs')
-rw-r--r--railties/configs/databases/mysql.yml3
-rw-r--r--railties/configs/databases/postgresql.yml3
2 files changed, 6 insertions, 0 deletions
diff --git a/railties/configs/databases/mysql.yml b/railties/configs/databases/mysql.yml
index b3525663bf..aae510f860 100644
--- a/railties/configs/databases/mysql.yml
+++ b/railties/configs/databases/mysql.yml
@@ -13,6 +13,7 @@
# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
adapter: mysql
+ encoding: utf8
database: <%= app_name %>_development
username: root
password:
@@ -27,6 +28,7 @@ development:
# Do not set this db to the same as development or production.
test:
adapter: mysql
+ encoding: utf8
database: <%= app_name %>_test
username: root
password:
@@ -38,6 +40,7 @@ test:
production:
adapter: mysql
+ encoding: utf8
database: <%= app_name %>_production
username: root
password:
diff --git a/railties/configs/databases/postgresql.yml b/railties/configs/databases/postgresql.yml
index 3c146c13a1..ee5a9d117a 100644
--- a/railties/configs/databases/postgresql.yml
+++ b/railties/configs/databases/postgresql.yml
@@ -6,6 +6,7 @@
# gem install postgres-pr
development:
adapter: postgresql
+ encoding: unicode
database: <%= app_name %>_development
username: <%= app_name %>
password:
@@ -33,12 +34,14 @@ development:
# Do not set this db to the same as development or production.
test:
adapter: postgresql
+ encoding: unicode
database: <%= app_name %>_test
username: <%= app_name %>
password:
production:
adapter: postgresql
+ encoding: unicode
database: <%= app_name %>_production
username: <%= app_name %>
password: