diff --git a/db/migrate/limits_to_mysql.rb b/db/migrate/limits_to_mysql.rb
index 4dc3b830bc6c87bc49f2d154c63609a7a49a83e4..2b7afae6d7cb3f73197f2c6d9549ba216429af82 100644
--- a/db/migrate/limits_to_mysql.rb
+++ b/db/migrate/limits_to_mysql.rb
@@ -1,6 +1,6 @@
 class LimitsToMysql < ActiveRecord::Migration
   def up
-    return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'mysql2'
+    return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/
 
     change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647
     change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647
diff --git a/lib/tasks/gitlab/setup.rake b/lib/tasks/gitlab/setup.rake
index 853994dd67db0dc2a2f7b636aafc3c4e1212c045..8b4ccdfc3fe01eb0b7ad8308746024c02bec7875 100644
--- a/lib/tasks/gitlab/setup.rake
+++ b/lib/tasks/gitlab/setup.rake
@@ -15,14 +15,7 @@ namespace :gitlab do
     end
 
     Rake::Task["db:setup"].invoke
-
-    config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
-    success = case config["adapter"]
-              when /^mysql/ then
-                Rake::Task["add_limits_mysql"].invoke
-              when "postgresql" then
-              end
-
+    Rake::Task["add_limits_mysql"].invoke
     Rake::Task["db:seed_fu"].invoke
   rescue Gitlab::TaskAbortedByUserError
     puts "Quitting...".red