Merge remote-tracking branch 'upstream/pull/2839'

[rails.git] / db / migrate / 002_cleanup_osm_db.rb

diff --git a/db/migrate/002_cleanup_osm_db.rb b/db/migrate/002_cleanup_osm_db.rb
index fb27c91b7bcc8078e1b01245ef5198066642e330..8728f1a6a3947a114b1022a2ba32a2cc7b53d5c5 100644 (file)
--- a/db/migrate/002_cleanup_osm_db.rb
+++ b/db/migrate/002_cleanup_osm_db.rb
@@ -1,6 +1,6 @@
-require 'migrate'
+require "migrate"
 
-class CleanupOsmDb < ActiveRecord::Migration
+class CleanupOsmDb < ActiveRecord::Migration[4.2]
   def self.up
     change_column "current_nodes", "latitude", :float, :limit => 53, :null => false
     change_column "current_nodes", "longitude", :float, :limit => 53, :null => false
@@ -21,7 +21,7 @@ class CleanupOsmDb < ActiveRecord::Migration
     change_column "current_way_segments", "id", :bigint, :null => false
     change_column "current_way_segments", "segment_id", :bigint, :null => false
     change_column "current_way_segments", "sequence_id", :bigint, :null => false
-    add_primary_key "current_way_segments", ["id", "sequence_id"]
+    add_primary_key "current_way_segments", %w[id sequence_id]
     remove_index "current_way_segments", :name => "current_way_segments_id_idx"
 
     change_column "current_way_tags", "id", :bigint, :null => false
@@ -40,7 +40,7 @@ class CleanupOsmDb < ActiveRecord::Migration
     remove_index "gps_points", :name => "points_uid_idx"
     remove_index "gps_points", :name => "points_idx"
     remove_column "gps_points", "user_id"
-    add_index "gps_points", ["latitude", "longitude"], :name => "points_idx"
+    add_index "gps_points", %w[latitude longitude], :name => "points_idx"
     change_column "gps_points", "trackid", :integer, :null => false
     change_column "gps_points", "latitude", :integer, :null => false
     change_column "gps_points", "longitude", :integer, :null => false
@@ -96,7 +96,7 @@ class CleanupOsmDb < ActiveRecord::Migration
     add_index "users", ["display_name"], :name => "users_display_name_idx", :unique => true
 
     change_column "way_segments", "segment_id", :bigint, :null => false
- 
+
     change_column "way_tags", "k", :string, :null => false
     change_column "way_tags", "v", :string, :null => false
     change_column "way_tags", "version", :bigint, :null => false
@@ -120,7 +120,7 @@ class CleanupOsmDb < ActiveRecord::Migration
     change_column "way_tags", "k", :string, :default => nil
 
     change_column "way_segments", "segment_id", :integer
- 
+
     remove_index "users", :name => "users_display_name_idx"
     add_index "users", ["display_name"], :name => "users_display_name_idx"
     remove_index "users", :name => "users_email_idx"
@@ -204,14 +204,14 @@ class CleanupOsmDb < ActiveRecord::Migration
     change_column "current_way_segments", "segment_id", :bigint
     change_column "current_way_segments", "id", :bigint
 
-    add_index "current_segments", ["id", "visible"], :name => "current_segments_id_visible_idx"
+    add_index "current_segments", %w[id visible], :name => "current_segments_id_visible_idx"
     remove_primary_key "current_segments"
     change_column "current_segments", "timestamp", :datetime
     change_column "current_segments", "visible", :boolean
     change_column "current_segments", "user_id", :bigint
     change_column "current_segments", "node_b", :bigint
     change_column "current_segments", "node_a", :bigint
-    
+
     add_index "current_nodes", ["id"], :name => "current_nodes_id_idx"
     remove_primary_key "current_nodes"
     change_column "current_nodes", "timestamp", :datetime