aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-10-24 14:46:28 +0200
committerXavier Noria <fxn@hashref.com>2011-10-24 14:46:28 +0200
commit9dd168c40262e850885fcb3dd0028b9067bb627f (patch)
tree3061921a27c86e13f82a22f477976efbc439d902
parent17bf04ff0dbb2f11dd7bc1a87df035a96f9432ef (diff)
downloadrails-9dd168c40262e850885fcb3dd0028b9067bb627f.tar.gz
rails-9dd168c40262e850885fcb3dd0028b9067bb627f.tar.bz2
rails-9dd168c40262e850885fcb3dd0028b9067bb627f.zip
minor revision to some new code in databases.rake
-rw-r--r--activerecord/lib/active_record/railties/databases.rake5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 705ffe9dd7..f8fa65ea87 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -548,8 +548,9 @@ def drop_database_and_rescue(config)
end
def configs_for_environment
- environments = [Rails.env, ("test" if Rails.env.development?)]
- ActiveRecord::Base.configurations.values_at(*environments).compact
+ environments = [Rails.env]
+ environments << 'test' if Rails.env.development?
+ ActiveRecord::Base.configurations.values_at(*environments)
end
def session_table_name