From a34eb120f1e2d34ff035b5d7240bdd1c88e8db3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 17 Jun 2021 01:00:59 +0000 Subject: [PATCH] Don't reuse the same connection to drop the tables The test can disconnect the connection so we can't reuse. --- .../cases/adapters/mysql2/nested_deadlock_test.rb | 8 ++++---- .../test/cases/adapters/mysql2/transaction_test.rb | 12 ++++++------ .../adapters/postgresql/transaction_nested_test.rb | 10 +++++----- .../cases/adapters/postgresql/transaction_test.rb | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/activerecord/test/cases/adapters/mysql2/nested_deadlock_test.rb b/activerecord/test/cases/adapters/mysql2/nested_deadlock_test.rb index 955656b89e..a5736926cf 100644 --- a/activerecord/test/cases/adapters/mysql2/nested_deadlock_test.rb +++ b/activerecord/test/cases/adapters/mysql2/nested_deadlock_test.rb @@ -15,10 +15,10 @@ class Sample < ActiveRecord::Base @abort, Thread.abort_on_exception = Thread.abort_on_exception, false Thread.report_on_exception, @original_report_on_exception = false, Thread.report_on_exception - @connection = ActiveRecord::Base.connection - @connection.clear_cache! + connection = ActiveRecord::Base.connection + connection.clear_cache! - @connection.create_table("samples", force: true) do |t| + connection.create_table("samples", force: true) do |t| t.integer "value" end @@ -27,7 +27,7 @@ class Sample < ActiveRecord::Base teardown do ActiveRecord::Base.clear_active_connections! - @connection.drop_table "samples", if_exists: true + ActiveRecord::Base.connection.drop_table "samples", if_exists: true Thread.abort_on_exception = @abort Thread.report_on_exception = @original_report_on_exception diff --git a/activerecord/test/cases/adapters/mysql2/transaction_test.rb b/activerecord/test/cases/adapters/mysql2/transaction_test.rb index 2041cc308f..5ab9e2ee92 100644 --- a/activerecord/test/cases/adapters/mysql2/transaction_test.rb +++ b/activerecord/test/cases/adapters/mysql2/transaction_test.rb @@ -15,12 +15,12 @@ class Sample < ActiveRecord::Base @abort, Thread.abort_on_exception = Thread.abort_on_exception, false Thread.report_on_exception, @original_report_on_exception = false, Thread.report_on_exception - @connection = ActiveRecord::Base.connection - @connection.clear_cache! + connection = ActiveRecord::Base.connection + connection.clear_cache! - @connection.transaction do - @connection.drop_table "samples", if_exists: true - @connection.create_table("samples") do |t| + connection.transaction do + connection.drop_table "samples", if_exists: true + connection.create_table("samples") do |t| t.integer "value" end end @@ -29,7 +29,7 @@ class Sample < ActiveRecord::Base end teardown do - @connection.drop_table "samples", if_exists: true + ActiveRecord::Base.connection.drop_table "samples", if_exists: true Thread.abort_on_exception = @abort Thread.report_on_exception = @original_report_on_exception diff --git a/activerecord/test/cases/adapters/postgresql/transaction_nested_test.rb b/activerecord/test/cases/adapters/postgresql/transaction_nested_test.rb index 5009e5cc77..aea79924bf 100644 --- a/activerecord/test/cases/adapters/postgresql/transaction_nested_test.rb +++ b/activerecord/test/cases/adapters/postgresql/transaction_nested_test.rb @@ -16,11 +16,11 @@ class Sample < ActiveRecord::Base @abort, Thread.abort_on_exception = Thread.abort_on_exception, false Thread.report_on_exception, @original_report_on_exception = false, Thread.report_on_exception - @connection = ActiveRecord::Base.connection + connection = ActiveRecord::Base.connection - @connection.transaction do - @connection.drop_table "samples", if_exists: true - @connection.create_table("samples") do |t| + connection.transaction do + connection.drop_table "samples", if_exists: true + connection.create_table("samples") do |t| t.integer "value" end end @@ -29,7 +29,7 @@ class Sample < ActiveRecord::Base end teardown do - @connection.drop_table "samples", if_exists: true + ActiveRecord::Base.connection.drop_table "samples", if_exists: true Thread.abort_on_exception = @abort Thread.report_on_exception = @original_report_on_exception diff --git a/activerecord/test/cases/adapters/postgresql/transaction_test.rb b/activerecord/test/cases/adapters/postgresql/transaction_test.rb index ff7efd46bd..10783678dc 100644 --- a/activerecord/test/cases/adapters/postgresql/transaction_test.rb +++ b/activerecord/test/cases/adapters/postgresql/transaction_test.rb @@ -16,11 +16,11 @@ class Sample < ActiveRecord::Base @abort, Thread.abort_on_exception = Thread.abort_on_exception, false Thread.report_on_exception, @original_report_on_exception = false, Thread.report_on_exception - @connection = ActiveRecord::Base.connection + connection = ActiveRecord::Base.connection - @connection.transaction do - @connection.drop_table "samples", if_exists: true - @connection.create_table("samples") do |t| + connection.transaction do + connection.drop_table "samples", if_exists: true + connection.create_table("samples") do |t| t.integer "value" end end @@ -29,7 +29,7 @@ class Sample < ActiveRecord::Base end teardown do - @connection.drop_table "samples", if_exists: true + ActiveRecord::Base.connection.drop_table "samples", if_exists: true Thread.abort_on_exception = @abort Thread.report_on_exception = @original_report_on_exception