diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-14 03:10:22 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-02-14 12:10:56 +0100 |
| commit | 5f9a5a51deb3c7f41993c4a3e7fa5cbbf342113f (patch) | |
| tree | 1144c88c6d673200d0562fe473505c5549d00b23 /activerecord/lib/active_record | |
| parent | 305d5d5e90dce181c5e33e98e3217eec423ee1fc (diff) | |
| download | rails-5f9a5a51deb3c7f41993c4a3e7fa5cbbf342113f.tar.gz rails-5f9a5a51deb3c7f41993c4a3e7fa5cbbf342113f.tar.bz2 rails-5f9a5a51deb3c7f41993c4a3e7fa5cbbf342113f.zip | |
Merge pull request #5038 from carlosantoniodasilva/fix-db-migrate-redo
Always reenable _dump task in AR databases rake. Closes #5030
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index de299dbe91..2df83514bd 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/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'] |