aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDoug Richardson <dougie.richardson@gmail.com>2010-03-31 23:53:26 -0700
committerwycats <wycats@gmail.com>2010-04-01 08:36:57 -0700
commite8292abbcd581f2fdad368fc5760416071b4b67f (patch)
tree8e594997b8c32a2343473424224993a7dd30d225 /activerecord/lib
parent81e69332466003732846bd7dbc04e8550bfe16a1 (diff)
downloadrails-e8292abbcd581f2fdad368fc5760416071b4b67f.tar.gz
rails-e8292abbcd581f2fdad368fc5760416071b4b67f.tar.bz2
rails-e8292abbcd581f2fdad368fc5760416071b4b67f.zip
Read postgresql encoding using string key instead of symbol [#4304 state:resolved]
Signed-off-by: wycats <wycats@gmail.com>
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 06485b9033..a107befef3 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -84,7 +84,7 @@ namespace :db do
end
end
when 'postgresql'
- @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8'
+ @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8'
schema_search_path = config['schema_search_path'] || 'public'
first_in_schema_search_path = schema_search_path.split(',').first.strip
begin