diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-14 03:10:22 -0800 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-14 03:10:22 -0800 |
commit | abdff445fbd36e47fb1f3e3b6f49f819f2c37d44 (patch) | |
tree | fe1fa2cd1691e2d0c15eb04bf5aa9978ed92c14c /activerecord/lib/active_record | |
parent | fa04a737d565c7f06bcac875b4707a01c04acf84 (diff) | |
parent | 4b44c20e5a9bb105dd913cc3849d224ac71814ab (diff) | |
download | rails-abdff445fbd36e47fb1f3e3b6f49f819f2c37d44.tar.gz rails-abdff445fbd36e47fb1f3e3b6f49f819f2c37d44.tar.bz2 rails-abdff445fbd36e47fb1f3e3b6f49f819f2c37d44.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 821410f42c..067117a465 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/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'] |