Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Always reenable _dump task in AR databases rake. Closes #5030

This allows the internal :_dump task to be called as many times as
required. For instance, `rake db:migrate:redo` calls two tasks that
internally call :_dump, and without reenabling it to be reinvoked,
the database was left in incorrect state.
  • Loading branch information...
commit 4b44c20e5a9bb105dd913cc3849d224ac71814ab 1 parent 7f6ee93
@carlosantoniodasilva carlosantoniodasilva authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 activerecord/lib/active_record/railties/databases.rake
View
5 activerecord/lib/active_record/railties/databases.rake
@@ -162,6 +162,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
@@ -612,7 +615,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']
Please sign in to comment.
Something went wrong with that request. Please try again.