X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/11cc4a5e601dd288d601e6e35a72d159062f18b5..7e0fb05dd2128ea7e93ac214bca813388ceaa012:/db/migrate/020_populate_node_tags_and_remove.rb diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb index caa355419..16eafd89d 100644 --- a/db/migrate/020_populate_node_tags_and_remove.rb +++ b/db/migrate/020_populate_node_tags_and_remove.rb @@ -1,5 +1,3 @@ -require "migrate" - class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2] def self.up have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i.nonzero? @@ -11,10 +9,10 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration[4.2] src = "#{cmd}.c" if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src) system("cc -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