X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..366a9e9097e6b8ca19cd3ecb2b08db1fbc0e2274:/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 d31d8844a..62f618abf 100644 --- a/db/migrate/008_remove_segments.rb +++ b/db/migrate/008_remove_segments.rb @@ -2,7 +2,7 @@ require "migrate" class RemoveSegments < ActiveRecord::Migration 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}." @@ -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 @@ -53,7 +53,7 @@ class RemoveSegments < ActiveRecord::Migration # now get the data back csvopts = "FIELDS TERMINATED BY ',' ENCLOSED BY '\"' ESCAPED BY '\"' LINES TERMINATED BY '\\n'" - tempfiles.each { |fn| File.chmod 0644, fn } if have_segs + tempfiles.each { |fn| File.chmod 0o644, fn } if have_segs if have_segs execute "LOAD DATA INFILE '#{ways}' INTO TABLE ways #{csvopts} (id, user_id, timestamp) SET visible = 1, version = 1"