Permalink
Browse files

Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo

Always reenable _dump task in AR databases rake. Closes #5030
  • Loading branch information...
1 parent 305d5d5 commit 5f9a5a51deb3c7f41993c4a3e7fa5cbbf342113f @josevalim josevalim committed with josevalim Feb 14, 2012
Showing with 4 additions and 1 deletion.
  1. +4 −1 activerecord/lib/active_record/railties/databases.rake
@@ -163,6 +163,9 @@ db_namespace = namespace :db do
else
raise "unknown schema format #{ActiveRecord::Base.schema_format}"
end
+ # Allow this task to be called as many times as required. An example is the
+ # migrate:redo task, which calls other two internally that depend on this one.
+ db_namespace['_dump'].reenable
end
namespace :migrate do
@@ -613,7 +616,7 @@ def firebird_db_string(config)
end
def set_psql_env(config)
- ENV['PGHOST'] = config['host'] if config['host']
+ ENV['PGHOST'] = config['host'] if config['host']
ENV['PGPORT'] = config['port'].to_s if config['port']
ENV['PGPASSWORD'] = config['password'].to_s if config['password']
ENV['PGUSER'] = config['username'].to_s if config['username']

0 comments on commit 5f9a5a5

Please sign in to comment.