1 files changed, 7 insertions, 9 deletions
diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake
index 068dc463d16..a446a17dfc3 100644
--- a/lib/tasks/gitlab/db.rake
+++ b/lib/tasks/gitlab/db.rake
@@ -131,14 +131,6 @@ namespace :gitlab do
       end
     end
 
-    desc 'GitLab | DB | Sets up EE specific database functionality'
-
-    if Gitlab.ee?
-      task setup_ee: %w[db:drop:geo db:create:geo db:schema:load:geo db:migrate:geo]
-    else
-      task :setup_ee
-    end
-
     desc 'This adjusts and cleans db/structure.sql - it runs after db:structure:dump'
     task :clean_structure_sql do |task_name|
       ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
@@ -356,7 +348,13 @@ namespace :gitlab do
       Rake::Task['db:drop'].invoke
       Rake::Task['db:create'].invoke
       ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
-        ActiveRecord::Base.establish_connection(db_config.configuration_hash.merge(username: username)) # rubocop: disable Database/EstablishConnection
+        config = ActiveRecord::DatabaseConfigurations::HashConfig.new(
+          db_config.env_name,
+          db_config.name,
+          db_config.configuration_hash.merge(username: username)
+        )
+
+        ActiveRecord::Base.establish_connection(config) # rubocop: disable Database/EstablishConnection
         Gitlab::Database.check_for_non_superuser
         Rake::Task['db:migrate'].invoke
       end