diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-16 13:26:02 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-23 13:08:51 +0400 |
| commit | cd61239540c00279563cc0e4ae763a569be0bef5 (patch) | |
| tree | f27e65b62150547ff638e401f041e810c9ba20da | |
| parent | 43e77099d86960401013a45f56e29bfb83368d2c (diff) | |
Move the adapter check to the migration
| -rw-r--r-- | db/migrate/limits_to_mysql.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/setup.rake | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/db/migrate/limits_to_mysql.rb b/db/migrate/limits_to_mysql.rb index 4dc3b830bc6..2b7afae6d7c 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 853994dd67d..8b4ccdfc3fe 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 |