diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-26 10:32:29 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-26 10:32:29 -0700 |
| commit | 315f5557441a826666e91936ce01675ee77bd40f (patch) | |
| tree | e4057bb79662f55e98bcea66360694817a66999b /activerecord | |
| parent | 9dc41a27d91350125f5aba51931cea692d8bdacf (diff) | |
| parent | 253ba7779e62b334767b5b21f1811afcd0cb054d (diff) | |
| download | rails-315f5557441a826666e91936ce01675ee77bd40f.tar.gz rails-315f5557441a826666e91936ce01675ee77bd40f.tar.bz2 rails-315f5557441a826666e91936ce01675ee77bd40f.zip | |
Merged pull request #307 from arunagw/master.
jdbcpostgresql support added into template.
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 2 |
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 a49f940e5b..7d76d7a19f 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -100,7 +100,7 @@ db_namespace = namespace :db do $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset'] end end - when 'postgresql' + when /postgresql/ @encoding = config['encoding'] || ENV['CHARSET'] || 'utf8' begin ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public')) |