Move the adapter check to the migration

Jacob Vosmaer
1 parent 43e77099
Showing 2 changed files with 2 additions and 9 deletions Show diff stats
db/migrate/limits_to_mysql.rb
lib/tasks/gitlab/setup.rake
 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
@@ -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
1	1	class LimitsToMysql < ActiveRecord::Migration
2	2	def up
3		- return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'mysql2'
	3	+ return unless ActiveRecord::Base.configurations[Rails.env]['adapter'] =~ /^mysql/
4	4
5	5	change_column :merge_request_diffs, :st_commits, :text, limit: 2147483647
6	6	change_column :merge_request_diffs, :st_diffs, :text, limit: 2147483647
...	...
...	...	@@ -15,14 +15,7 @@ namespace :gitlab do
15	15	end
16	16
17	17	Rake::Task["db:setup"].invoke
18		-
19		- config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
20		- success = case config["adapter"]
21		- when /^mysql/ then
22		- Rake::Task["add_limits_mysql"].invoke
23		- when "postgresql" then
24		- end
25		-
	18	+ Rake::Task["add_limits_mysql"].invoke
26	19	Rake::Task["db:seed_fu"].invoke
27	20	rescue Gitlab::TaskAbortedByUserError
28	21	puts "Quitting...".red
...	...