aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkevich <slava.markevich@gmail.com>2013-05-02 18:09:59 +0300
committermarkevich <slava.markevich@gmail.com>2013-05-02 18:09:59 +0300
commit56445c9075e22fdf00b534363c0744c78d6037f0 (patch)
tree85e9fbedb387729bbc7579337c391c1f1c257f7a
parentca2bc303a9764f23aa1b610c6b06cadbb23d5408 (diff)
downloadrails-56445c9075e22fdf00b534363c0744c78d6037f0.tar.gz
rails-56445c9075e22fdf00b534363c0744c78d6037f0.tar.bz2
rails-56445c9075e22fdf00b534363c0744c78d6037f0.zip
rake:db:test:prepare falls back to original environment after execution.
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/lib/active_record/railties/databases.rake10
2 files changed, 11 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c1b849ce68..b69f7d6090 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -35,5 +35,9 @@
* Abort a rake task when missing db/structure.sql like `db:schema:load` task.
*kennyj*
+
+* rake:db:test:prepare falls back to original environment after execution.
+
+ *Slava Markevich*
Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/activerecord/CHANGELOG.md) for previous changes.
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 92bef09ff5..434af3c5f8 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -319,9 +319,13 @@ db_namespace = namespace :db do
# desc "Recreate the test database from an existent schema.rb file"
task :load_schema => 'db:test:purge' do
- ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
- ActiveRecord::Schema.verbose = false
- db_namespace["schema:load"].invoke
+ begin
+ ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+ ActiveRecord::Schema.verbose = false
+ db_namespace["schema:load"].invoke
+ ensure
+ ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env])
+ end
end
# desc "Recreate the test database from an existent structure.sql file"