diff options
author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-01-09 20:45:14 -0800 |
---|---|---|
committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-01-09 20:45:14 -0800 |
commit | 07f6a1cd945be421804f75bf06f95656ac5b121d (patch) | |
tree | 56da35cdc36e22f594b532427fcccc9c377490e8 | |
parent | 8a5b480ebb46215210294b87a7ed9f1d8a032312 (diff) | |
parent | e633cdb34a382fc606a424c5861764a9707a771d (diff) | |
download | rails-07f6a1cd945be421804f75bf06f95656ac5b121d.tar.gz rails-07f6a1cd945be421804f75bf06f95656ac5b121d.tar.bz2 rails-07f6a1cd945be421804f75bf06f95656ac5b121d.zip |
Merge pull request #13659 from prathamesh-sonpatki/fix-build
Restore DATABASE_URL even if it's nil in connection_handler test
-rw-r--r-- | activerecord/test/cases/connection_adapters/connection_handler_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/connection_adapters/connection_handler_test.rb b/activerecord/test/cases/connection_adapters/connection_handler_test.rb index 3365ad1294..318cc5a32c 100644 --- a/activerecord/test/cases/connection_adapters/connection_handler_test.rb +++ b/activerecord/test/cases/connection_adapters/connection_handler_test.rb @@ -14,7 +14,7 @@ module ActiveRecord end def teardown - ENV["DATABASE_URL"] = @previous_database_url if @previous_database_url + ENV["DATABASE_URL"] = @previous_database_url end def test_string_connection |