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

[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..b46fdf25f4e7de0fcce8e7eff0f2ed78a355228e 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,13 +1,19 @@
-class TileTracepoints < ActiveRecord::Migration
+require "migrate"
+
+class TileTracepoints < ActiveRecord::Migration[4.2]
+  class Tracepoint < ApplicationRecord
+    self.table_name = "gps_points"
+  end
+
   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"
 
-    begin
+    if ENV["USE_DB_FUNCTIONS"]
       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|
+    else
+      Tracepoint.all.each do |tp|
         tp.latitude = tp.latitude * 10
         tp.longitude = tp.longitude * 10
         tp.save!
@@ -18,7 +24,7 @@ class TileTracepoints < ActiveRecord::Migration
   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