Merge remote-tracking branch 'upstream/pull/5389'

[rails.git] / db / migrate / 008_remove_segments.rb

diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb
index f8a3085c6047b15b5cb06f24bf01115c1d03b7e7..504528e4ce7ad9c933a4885700928f8fa5fef6ae 100644 (file)
--- a/db/migrate/008_remove_segments.rb
+++ b/db/migrate/008_remove_segments.rb
@@ -1,5 +1,3 @@
-require "migrate"
-
 class RemoveSegments < ActiveRecord::Migration[4.2]
   def self.up
     have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero?
@@ -11,7 +9,7 @@ class RemoveSegments < ActiveRecord::Migration[4.2]
       src = "#{cmd}.cc"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("c++ -O3 -Wall `mysql_config --cflags --libs` " \
-          "#{src} -o #{cmd}") || raise
+               "#{src} -o #{cmd}") || raise
       end
 
       conn_opts = ApplicationRecord.connection