diff options
| author | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
| commit | 74fd17346f30fddba0e174ae17f5697f2c22279e (patch) | |
| tree | 1267cea613ee4a73a2f5ddf3fb24d224dc8bbded /railties/lib/tasks/databases.rake | |
| parent | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (diff) | |
| parent | 4dedc7ddcaffa8c606af11ae2d32707131b99a2e (diff) | |
| download | rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.gz rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.bz2 rails-74fd17346f30fddba0e174ae17f5697f2c22279e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/tasks/databases.rake')
| -rw-r--r-- | railties/lib/tasks/databases.rake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 63f71448f8..fe099e30b9 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -45,7 +45,7 @@ namespace :db do when 'postgresql' @encoding = config[:encoding] || ENV['CHARSET'] || 'utf8' begin - ActiveRecord::Base.establish_connection(config.merge('database' => 'template1')) + ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres')) ActiveRecord::Base.connection.create_database(config['database'], config.merge('encoding' => @encoding)) ActiveRecord::Base.establish_connection(config) rescue @@ -368,7 +368,7 @@ def drop_database(config) when /^sqlite/ FileUtils.rm(File.join(RAILS_ROOT, config['database'])) when 'postgresql' - ActiveRecord::Base.establish_connection(config.merge('database' => 'template1')) + ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres')) ActiveRecord::Base.connection.drop_database config['database'] end end |