diff options
| author | rick <rick@spacemonkey.local> | 2008-05-05 23:19:21 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-05 23:19:21 -0700 |
| commit | 0052938ac5b8894b27fdb9f27b1ed39f0a9ea176 (patch) | |
| tree | f714643a4043d9fb73b39ec2a114d18f5deeffdd /railties/lib/tasks | |
| parent | eacb5cf0cab6447db78085c8bda6c94dd329ce6b (diff) | |
| parent | 3cffe92ff066c2b35eef409547db93652c5cccfc (diff) | |
| download | rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.tar.gz rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.tar.bz2 rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.zip | |
Merge commit 'core/master'
Diffstat (limited to 'railties/lib/tasks')
| -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 e39f9ca197..20fdcce205 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' => nil)) + ActiveRecord::Base.establish_connection(config.merge('database' => 'template1')) ActiveRecord::Base.connection.create_database(config['database'], :encoding => @encoding) ActiveRecord::Base.establish_connection(config) rescue @@ -373,7 +373,7 @@ def drop_database(config) when /^sqlite/ FileUtils.rm(File.join(RAILS_ROOT, config['database'])) when 'postgresql' - ActiveRecord::Base.establish_connection(config.merge('database' => nil)) + ActiveRecord::Base.establish_connection(config.merge('database' => 'template1')) ActiveRecord::Base.connection.drop_database config['database'] end end |