From e45d4cf97dd0d0d08ea13827628d5ed064fb1f36 Mon Sep 17 00:00:00 2001 From: bastilian Date: Tue, 12 May 2009 21:01:20 +0200 Subject: [PATCH] Only using File.join if it is a relative path --- railties/lib/tasks/databases.rake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index cdab5d8..d9d62e6 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -411,7 +411,7 @@ def drop_database(config) ActiveRecord::Base.establish_connection(config) ActiveRecord::Base.connection.drop_database config['database'] when /^sqlite/ - FileUtils.rm(File.join(RAILS_ROOT, config['database'])) + FileUtils.rm((config['database'] =~ /^\// ? config['database'] : File.join(RAILS_ROOT, config['database']))) when 'postgresql' ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public')) ActiveRecord::Base.connection.drop_database config['database'] -- 1.6.2.1