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

[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 f4d27c18c50cb50adf9fb2e1dc3574f7275b98f8..2433c3f4fd971f0b236bf3e17185d2bec3ec50c2 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,13 +1,15 @@
-class TileTracepoints < ActiveRecord::Migration
+require "migrate"
+
+class TileTracepoints < ActiveRecord::Migration[5.0]
   def self.up
-    add_column "gps_points", "tile", :integer, :null => false, :unsigned => true
+    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!
@@ -16,7 +18,9 @@ class TileTracepoints < ActiveRecord::Migration
   end
 
   def self.down
-    add_index "gps_points", ["latitude", "longitude"], :name => "points_idx"
+    Tracepoint.update_all("latitude = latitude / 10, longitude = longitude / 10")
+
+    add_index "gps_points", %w[latitude longitude], :name => "points_idx"
     remove_index "gps_points", :name => "points_tile_idx"
     remove_column "gps_points", "tile"
   end