aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-08-02 10:29:44 +0900
committerGitHub <noreply@github.com>2018-08-02 10:29:44 +0900
commit67fa1ad0c3b811aa527ec748e14d95dee2db9f69 (patch)
tree4b1a088550c41c20b8de8991e4a53357f526d9fc
parentbd01f9831cb6416b34f566167237697e666e5e41 (diff)
parent7157067eb2ea042508827820e75e69873e0b1883 (diff)
downloadrails-67fa1ad0c3b811aa527ec748e14d95dee2db9f69.tar.gz
rails-67fa1ad0c3b811aa527ec748e14d95dee2db9f69.tar.bz2
rails-67fa1ad0c3b811aa527ec748e14d95dee2db9f69.zip
Merge pull request #33513 from twitnithegirl/only_connect_once_in_parallel_tests
remove redundant establish_connection call in test_databases.rb
-rw-r--r--activerecord/lib/active_record/test_databases.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/test_databases.rb b/activerecord/lib/active_record/test_databases.rb
index 071e8924c4..5b4efe22c9 100644
--- a/activerecord/lib/active_record/test_databases.rb
+++ b/activerecord/lib/active_record/test_databases.rb
@@ -19,7 +19,6 @@ module ActiveRecord
connection_spec["database"] += "-#{i}"
ActiveRecord::Tasks::DatabaseTasks.create(connection_spec)
- ActiveRecord::Base.establish_connection(connection_spec)
ActiveRecord::Tasks::DatabaseTasks.load_schema(connection_spec)
ensure
ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[Rails.env])