X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/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 8fa7b7e5d..8315cb143 100644
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -5,21 +5,21 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
     have_nodes = select_value("SELECT count(*) FROM current_nodes").to_i != 0
 
     if have_nodes
-      prefix = File.join Dir.tmpdir, "020_populate_node_tags_and_remove.#{$$}."
+      prefix = File.join Dir.tmpdir, "020_populate_node_tags_and_remove.#{$PROCESS_ID}."
 
       cmd = "db/migrate/020_populate_node_tags_and_remove_helper"
       src = "#{cmd}.c"
-      if not File.exists? cmd or File.mtime(cmd) < File.mtime(src) then 
-        system 'cc -O3 -Wall `mysql_config --cflags --libs` ' +
-          "#{src} -o #{cmd}" or fail
+      if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
+        system('cc -O3 -Wall `mysql_config --cflags --libs` ' +
+          "#{src} -o #{cmd}") || fail
       end
 
       conn_opts = ActiveRecord::Base.connection.instance_eval { @connection_options }
-      args = conn_opts.map { |arg| arg.to_s } + [prefix]
+      args = conn_opts.map(&:to_s) + [prefix]
       fail "#{cmd} failed" unless system cmd, *args
 
-      tempfiles = ['nodes', 'node_tags', 'current_nodes', 'current_node_tags'].
-        map { |base| prefix + base }
+      tempfiles = %w(nodes node_tags current_nodes current_node_tags)
+                  .map { |base| prefix + base }
       nodes, node_tags, current_nodes, current_node_tags = tempfiles
     end
 
@@ -46,7 +46,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
     csvopts = "FIELDS TERMINATED BY ',' ENCLOSED BY '\"' ESCAPED BY '\"' LINES TERMINATED BY '\\n'"
 
     if have_nodes
-      execute "LOAD DATA INFILE '#{nodes}' INTO TABLE nodes #{csvopts} (id, latitude, longitude, user_id, visible, timestamp, tile, version)";
+      execute "LOAD DATA INFILE '#{nodes}' INTO TABLE nodes #{csvopts} (id, latitude, longitude, user_id, visible, timestamp, tile, version)"
       execute "LOAD DATA INFILE '#{node_tags}' INTO TABLE node_tags #{csvopts} (id, version, k, v)"
       execute "LOAD DATA INFILE '#{current_node_tags}' INTO TABLE current_node_tags #{csvopts} (id, k, v)"
     end
@@ -55,8 +55,8 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
   end
 
   def self.down
-    raise ActiveRecord::IrreversibleMigration
-#    add_column :nodes, "tags", :text, :default => "", :null => false
-#    add_column :current_nodes, "tags", :text, :default => "", :null => false
+    fail ActiveRecord::IrreversibleMigration
+    #    add_column :nodes, "tags", :text, :default => "", :null => false
+    #    add_column :current_nodes, "tags", :text, :default => "", :null => false
   end
 end