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

[rails.git] / db / migrate / 005_tile_tracepoints.rb

diff --git a/db/migrate/005_tile_tracepoints.rb b/db/migrate/005_tile_tracepoints.rb
index 74d85d195629d7ad731eb54e28956f15c4b176eb..293b235c683d987bab338425697263c62df3cddc 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,24 +1,24 @@
-class TileTracepoints < ActiveRecord::Migration
+class TileTracepoints < ActiveRecord::Migration[4.2]
+  class Tracepoint < ApplicationRecord
+    self.table_name = "gps_points"
+  end
+

   def self.up
   def self.up

-    add_column "gps_points", "tile", :four_byte_unsigned
+    add_column "gps_points", "tile", :bigint

     add_index "gps_points", ["tile"], :name => "points_tile_idx"
     remove_index "gps_points", :name => "points_idx"
 
     add_index "gps_points", ["tile"], :name => "points_tile_idx"
     remove_index "gps_points", :name => "points_idx"
 

-    begin
-      Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
-    rescue ActiveRecord::StatementInvalid => ex
-      Tracepoint.find(:all).each do |tp|
-        tp.latitude = tp.latitude * 10
-        tp.longitude = tp.longitude * 10
-        tp.save!
-      end
+    Tracepoint.all.each do |tp|
+      tp.latitude = tp.latitude * 10
+      tp.longitude = tp.longitude * 10
+      tp.save!

     end
   end
 
   def self.down
     Tracepoint.update_all("latitude = latitude / 10, longitude = longitude / 10")
 
     end
   end
 
   def self.down
     Tracepoint.update_all("latitude = latitude / 10, longitude = longitude / 10")
 

-    add_index "gps_points", ["latitude", "longitude"], :name => "points_idx"
+    add_index "gps_points", %w[latitude longitude], :name => "points_idx"

     remove_index "gps_points", :name => "points_tile_idx"
     remove_column "gps_points", "tile"
   end
     remove_index "gps_points", :name => "points_tile_idx"
     remove_column "gps_points", "tile"
   end