X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..4d6df34c4bca932b75f2260fe533b4d22c3651f9:/db/migrate/008_remove_segments.rb?ds=sidebyside diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb index 985a85820..504528e4c 100644 --- 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,11 +9,11 @@ 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 = ActiveRecord::Base.connection - .instance_eval { @connection_options } + conn_opts = ApplicationRecord.connection + .instance_eval { @connection_options } args = conn_opts.map(&:to_s) + [prefix] raise "#{cmd} failed" unless system cmd, *args