Update to iD v2.4.0

[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 51a4d1376233c28ed88494b24f3c7eca71ee5a30..00e5af293ba39f66f71c14d97082f9aa264c8291 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,13 +1,15 @@
+require "migrate"
+
 class TileTracepoints < ActiveRecord::Migration
   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!
@@ -18,7 +20,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