From 69dfeeb8b73bc0ba34fc876289efecdc80b6d0ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 17 Mar 2017 17:52:46 +0000
Subject: Merge branch 'database-config-method' into 'master'

Added Gitlab::Database.config

See merge request !10045
---
 config/initializers/sidekiq.rb   |  2 +-
 lib/gitlab/database.rb           |  6 +++++-
 spec/lib/gitlab/database_spec.rb | 14 ++++++++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 2b018c68703..ecd73956488 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -42,7 +42,7 @@ Sidekiq.configure_server do |config|
 
   Gitlab::SidekiqThrottler.execute!
 
-  config = ActiveRecord::Base.configurations[Rails.env] ||
+  config = Gitlab::Database.config ||
     Rails.application.config.database_configuration[Rails.env]
   config['pool'] = Sidekiq.options[:concurrency]
   ActiveRecord::Base.establish_connection(config)
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index f3f417c1a63..63b8d0d3b9d 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -5,8 +5,12 @@ module Gitlab
     # http://dev.mysql.com/doc/refman/5.7/en/integer-types.html
     MAX_INT_VALUE = 2147483647
 
+    def self.config
+      ActiveRecord::Base.configurations[Rails.env]
+    end
+
     def self.adapter_name
-      ActiveRecord::Base.configurations[Rails.env]['adapter']
+      config['adapter']
     end
 
     def self.mysql?
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index edd01d032c8..4ce4e6e1034 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -1,10 +1,16 @@
 require 'spec_helper'
 
-class MigrationTest
-  include Gitlab::Database
-end
-
 describe Gitlab::Database, lib: true do
+  before do
+    stub_const('MigrationTest', Class.new { include Gitlab::Database })
+  end
+
+  describe '.config' do
+    it 'returns a Hash' do
+      expect(described_class.config).to be_an_instance_of(Hash)
+    end
+  end
+
   describe '.adapter_name' do
     it 'returns the name of the adapter' do
       expect(described_class.adapter_name).to be_an_instance_of(String)
-- 
cgit v1.2.3