Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[rails.git] / 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 63b7ea21a110a2ae223253710812db9fa2a6cfa9..640019b15a4741a5ae7c3e76dd345d0f3a33b30f 100644 (file)
--- 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}."
@@ -11,12 +11,12 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
       src = "#{cmd}.c"
       if !File.exist?(cmd) || File.mtime(cmd) < File.mtime(src)
         system("cc -O3 -Wall `mysql_config --cflags --libs` " +
-          "#{src} -o #{cmd}") || fail
+          "#{src} -o #{cmd}") || raise
       end
 
       conn_opts = ActiveRecord::Base.connection.instance_eval { @connection_options }
       args = conn_opts.map(&:to_s) + [prefix]
-      fail "#{cmd} failed" unless system cmd, *args
+      raise "#{cmd} failed" unless system cmd, *args
 
       tempfiles = %w(nodes node_tags current_nodes current_node_tags)
                   .map { |base| prefix + base }
@@ -56,7 +56,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
   end
 
   def self.down
-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration
     #    add_column :nodes, "tags", :text, :default => "", :null => false
     #    add_column :current_nodes, "tags", :text, :default => "", :null => false
   end