Skip to content
Snippets Groups Projects
Verified Commit 581cfbae authored by Yorick Peterse's avatar Yorick Peterse
Browse files

Don't connect in Gitlab::Database.adapter_name

We don't need to connect when requesting the name of the database
adapter. This in turn should prevent us from requesting/leaking
connections just by asking whether we're using PostgreSQL or MySQL.
parent 58131ac9
No related branches found
No related tags found
No related merge requests found
---
title: Don't connect in Gitlab::Database.adapter_name
merge_request:
author:
Loading
Loading
@@ -6,7 +6,7 @@ module Gitlab
MAX_INT_VALUE = 2147483647
 
def self.adapter_name
connection.adapter_name
ActiveRecord::Base.configurations[Rails.env]['adapter']
end
 
def self.mysql?
Loading
Loading
Loading
Loading
@@ -5,6 +5,12 @@ class MigrationTest
end
 
describe Gitlab::Database, lib: true do
describe '.adapter_name' do
it 'returns the name of the adapter' do
expect(described_class.adapter_name).to be_an_instance_of(String)
end
end
# These are just simple smoke tests to check if the methods work (regardless
# of what they may return).
describe '.mysql?' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment