Move EE code out of Gitlab::Database

ee/lib/ee/gitlab/database.rb

@@ -3,6 +3,9 @@
 module EE
   module Gitlab
     module Database
+      extend ActiveSupport::Concern
+
+      class_methods do
         extend ::Gitlab::Utils::Override
 
         override :read_only?
@@ -42,4 +45,5 @@ module EE
         end
       end
     end
+  end
 end

lib/gitlab/database.rb

@@ -11,10 +11,6 @@ module Gitlab
     # https://dev.mysql.com/doc/refman/5.7/en/datetime.html
     MAX_TIMESTAMP_VALUE = Time.at((1 << 31) - 1).freeze
 
-    class << self
-      prepend EE::Gitlab::Database # rubocop: disable Cop/InjectEnterpriseEditionModule
-    end
-
     def self.config
       ActiveRecord::Base.configurations[Rails.env]
     end
@@ -274,3 +270,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Database.prepend(EE::Gitlab::Database)