Update to iD v2.4.0

[rails.git] / db / migrate / 006_tile_nodes.rb

diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index 8bfb6bc3fbca82765ddf2cfb7a63d44898505817..29200d06a52f29b12f28533003a848e5b77a1a14 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,4 +1,4 @@
-require 'migrate'
+require "migrate"
 
 class TileNodes < ActiveRecord::Migration
   def self.upgrade_table(from_table, to_table, model)
@@ -19,9 +19,7 @@ class TileNodes < ActiveRecord::Migration
       FROM #{from_table}
       END_SQL
 
-      model.all.each do |n|
-        n.save!
-      end
+      model.all.each(&:save!)
     end
   end
 
@@ -56,11 +54,11 @@ class TileNodes < ActiveRecord::Migration
     change_column "current_nodes", "tile", :bigint
 
     upgrade_table "current_nodes_v5", "current_nodes", Node
-    
+
     drop_table "current_nodes_v5"
 
-    remove_index "nodes", :name=> "nodes_uid_idx"
-    remove_index "nodes", :name=> "nodes_timestamp_idx"
+    remove_index "nodes", :name => "nodes_uid_idx"
+    remove_index "nodes", :name => "nodes_timestamp_idx"
     rename_table "nodes", "nodes_v5"
 
     create_table "nodes", :id => false do |t|
@@ -98,7 +96,7 @@ class TileNodes < ActiveRecord::Migration
       t.column "timestamp", :datetime, :null => false
     end
 
-    add_index "current_nodes", ["latitude", "longitude"], :name => "current_nodes_lat_lon_idx"
+    add_index "current_nodes", %w[latitude longitude], :name => "current_nodes_lat_lon_idx"
     add_index "current_nodes", ["timestamp"], :name => "current_nodes_timestamp_idx"
 
     downgrade_table "current_nodes_v6", "current_nodes"
@@ -118,7 +116,7 @@ class TileNodes < ActiveRecord::Migration
     end
 
     add_index "nodes", ["id"], :name => "nodes_uid_idx"
-    add_index "nodes", ["latitude", "longitude"], :name => "nodes_latlon_idx"
+    add_index "nodes", %w[latitude longitude], :name => "nodes_latlon_idx"
     add_index "nodes", ["timestamp"], :name => "nodes_timestamp_idx"
 
     downgrade_table "nodes_v6", "nodes"