Skip to content

Commit 45eb295

Browse files
authored
Merge pull request rails#45526 from eileencodes/remove-db-config-owner-name
Remove owner_name from db_config
2 parents c0f71da + 4a95e9a commit 45eb295

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

activerecord/lib/active_record/database_configurations/database_config.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ class DatabaseConfigurations
88
class DatabaseConfig # :nodoc:
99
attr_reader :env_name, :name
1010

11-
attr_accessor :owner_name
12-
1311
def initialize(env_name, name)
1412
@env_name = env_name
1513
@name = name

activerecord/test/cases/query_cache_test.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,14 +440,13 @@ def test_cache_is_available_when_connection_is_connected
440440
def test_cache_is_available_when_using_a_not_connected_connection
441441
skip "In-Memory DB can't test for using a not connected connection" if in_memory_db?
442442
db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary").dup
443-
db_config.owner_name = "test2"
444-
ActiveRecord::Base.connection_handler.establish_connection(db_config)
443+
new_conn = ActiveRecord::Base.connection_handler.establish_connection(db_config)
445444
assert_not_predicate Task, :connected?
446445

447446
Task.cache do
448447
assert_queries(1) { Task.find(1); Task.find(1) }
449448
ensure
450-
ActiveRecord::Base.connection_handler.remove_connection_pool(db_config.owner_name)
449+
ActiveRecord::Base.connection_handler.remove_connection_pool(new_conn)
451450
end
452451
end
453452

0 commit comments

Comments
 (0)