X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6..a402e811dac1f999dcf623ce6099e554d76c6de4:/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 e76ec6ee1..0fd1dc564 100644 --- a/db/migrate/020_populate_node_tags_and_remove.rb +++ b/db/migrate/020_populate_node_tags_and_remove.rb @@ -2,7 +2,7 @@ require "migrate" class PopulateNodeTagsAndRemove < ActiveRecord::Migration def self.up - have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i != 0 + have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i.nonzero? if have_nodes prefix = File.join Dir.tmpdir, "020_populate_node_tags_and_remove.#{$PROCESS_ID}." @@ -18,7 +18,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration args = conn_opts.map(&:to_s) + [prefix] raise "#{cmd} failed" unless system cmd, *args - tempfiles = %w(nodes node_tags current_nodes current_node_tags) + tempfiles = %w[nodes node_tags current_nodes current_node_tags] .map { |base| prefix + base } nodes, node_tags, current_nodes, current_node_tags = tempfiles end