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

[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 866b1ae510d3b72848f1ed6b1bb761ed7dfe0fd4..23f988dc19fc986bfa91ba4ccaae6b00306d9d08 100644 (file)
--- a/db/migrate/002_cleanup_osm_db.rb
+++ b/db/migrate/002_cleanup_osm_db.rb
@@ -1,6 +1,4 @@
-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
   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 +19,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
     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", %w(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
     remove_index "current_way_segments", :name => "current_way_segments_id_idx"
 
     change_column "current_way_tags", "id", :bigint, :null => false


@@ -40,7 +38,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"
     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", %w(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
     change_column "gps_points", "trackid", :integer, :null => false
     change_column "gps_points", "latitude", :integer, :null => false
     change_column "gps_points", "longitude", :integer, :null => false


@@ -204,7 +202,7 @@ class CleanupOsmDb < ActiveRecord::Migration
     change_column "current_way_segments", "segment_id", :bigint
     change_column "current_way_segments", "id", :bigint
 
     change_column "current_way_segments", "segment_id", :bigint
     change_column "current_way_segments", "id", :bigint
 

-    add_index "current_segments", %w(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
     remove_primary_key "current_segments"
     change_column "current_segments", "timestamp", :datetime
     change_column "current_segments", "visible", :boolean