Merge pull request #36773 from seejohnrun/db-configuration-separate-env-vars

Allow separate database env variables per-connection

1 files changed, 8 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb
index 3e387782f6..fcf13a910c 100644
--- a/activerecord/lib/active_record/database_configurations.rb
+++ b/activerecord/lib/active_record/database_configurations.rb
@@ -181,12 +181,19 @@ module ActiveRecord
       end
 
       def environment_url_config(env, spec_name, config)
-        url = ENV["DATABASE_URL"]
+        url = environment_value_for(spec_name)
         return unless url
 
         ActiveRecord::DatabaseConfigurations::UrlConfig.new(env, spec_name, url, config)
       end
 
+      def environment_value_for(spec_name)
+        spec_env_key = "#{spec_name.upcase}_DATABASE_URL"
+        url = ENV[spec_env_key]
+        url ||= ENV["DATABASE_URL"] if spec_name == "primary"
+        url
+      end
+
       def method_missing(method, *args, &blk)
         case method
         when :fetch