From 537afdb4df0b91dc4c08dd7c3aa749a32811ab1a Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Tue, 16 Jul 2024 15:06:52 +0100 Subject: [PATCH] Fix merge issue --- test/cases/schema_dumper_test_sqlserver.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cases/schema_dumper_test_sqlserver.rb b/test/cases/schema_dumper_test_sqlserver.rb index 1b03f8363..86a14cddc 100644 --- a/test/cases/schema_dumper_test_sqlserver.rb +++ b/test/cases/schema_dumper_test_sqlserver.rb @@ -162,7 +162,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase it "schemas are dumped and tables names only include non-default schema" do stream = StringIO.new - ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, stream) + ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream) generated_schema = stream.string # Only generate non-default schemas. Default schema is 'dbo'. @@ -184,7 +184,7 @@ def generate_schema_for_table(*table_names) stream = StringIO.new ActiveRecord::SchemaDumper.ignore_tables = all_tables - table_names - ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection_pool, stream) + ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream) @generated_schema = stream.string yield @generated_schema if block_given?