X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dae3dcf87edcfc0648cd0b93b069b0eee67d3ab7..29a780eb1af9ca5f8b55e53cf89701b297707607:/db/migrate/008_remove_segments.rb diff --git a/db/migrate/008_remove_segments.rb b/db/migrate/008_remove_segments.rb index f4d08cf18..5c9bd1c39 100644 --- a/db/migrate/008_remove_segments.rb +++ b/db/migrate/008_remove_segments.rb @@ -1,8 +1,8 @@ require "migrate" -class RemoveSegments < ActiveRecord::Migration +class RemoveSegments < ActiveRecord::Migration[5.0] def self.up - have_segs = select_value("SELECT count(*) FROM current_segments").to_i != 0 + have_segs = select_value("SELECT count(*) FROM current_segments").to_i.nonzero? if have_segs prefix = File.join Dir.tmpdir, "008_remove_segments.#{$PROCESS_ID}." @@ -10,7 +10,7 @@ class RemoveSegments < ActiveRecord::Migration cmd = "db/migrate/008_remove_segments_helper" src = "#{cmd}.cc" if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src) - system("c++ -O3 -Wall `mysql_config --cflags --libs` " + + system("c++ -O3 -Wall `mysql_config --cflags --libs` " \ "#{src} -o #{cmd}") || raise end @@ -19,7 +19,7 @@ class RemoveSegments < ActiveRecord::Migration args = conn_opts.map(&:to_s) + [prefix] raise "#{cmd} failed" unless system cmd, *args - tempfiles = %w(ways way_nodes way_tags relations relation_members relation_tags) + tempfiles = %w[ways way_nodes way_tags relations relation_members relation_tags] .map { |base| prefix + base } ways, way_nodes, way_tags, relations, relation_members, relation_tags = tempfiles