Merge pull request rails#47424 from eileencodes/support-string-or-symbol-for-owner_name

Support string or symbol for owner_name

Author: eileencodes

activerecord/lib/active_record/connection_adapters/abstract/connection_handler.rb

@@ -127,7 +127,7 @@ def each_connection_pool(role = nil, &block) # :nodoc:
       end
 
       def establish_connection(config, owner_name: Base, role: ActiveRecord::Base.current_role, shard: Base.current_shard)
-        owner_name = StringConnectionName.new(config.to_s) if config.is_a?(Symbol)
+        owner_name = determine_owner_name(owner_name, config)
 
         pool_config = resolve_pool_config(config, owner_name, role, shard)
         db_config = pool_config.db_config
@@ -349,6 +349,16 @@ def resolve_pool_config(config, connection_name, role, shard)
 
           ConnectionAdapters::PoolConfig.new(connection_name, db_config, role, shard)
         end
+
+        def determine_owner_name(owner_name, config)
+          if owner_name.is_a?(String) || owner_name.is_a?(Symbol)
+            StringConnectionName.new(owner_name.to_s)
+          elsif config.is_a?(Symbol)
+            StringConnectionName.new(config.to_s)
+          else
+            owner_name
+          end
+        end
     end
   end
 end

activerecord/test/cases/connection_adapters/connection_handler_test.rb

@@ -195,6 +195,22 @@ def test_establish_connection_using_top_level_key_in_two_level_config
         ActiveRecord::Base.configurations = @prev_configs
       end
 
+      def test_establish_connection_with_string_owner_name
+        config = {
+          "development" => { "adapter" => "sqlite3", "database" => "test/db/primary.sqlite3" },
+          "development_readonly" => { "adapter" => "sqlite3", "database" => "test/db/readonly.sqlite3" }
+        }
+        @prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
+
+        @handler.establish_connection(:development_readonly, owner_name: "custom_connection")
+
+        assert_not_nil pool = @handler.retrieve_connection_pool("custom_connection")
+        assert_not_predicate pool.connection, :preventing_writes?
+        assert_equal "test/db/readonly.sqlite3", pool.db_config.database
+      ensure
+        ActiveRecord::Base.configurations = @prev_configs
+      end
+
       def test_symbolized_configurations_assignment
         @prev_configs = ActiveRecord::Base.configurations
         config = {