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

[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 7c3bb8d1cbb1e0ef4c362f9b0fbec52b53b268a8..293b235c683d987bab338425697263c62df3cddc 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,7 +1,5 @@
-require "migrate"
-

 class TileTracepoints < ActiveRecord::Migration[4.2]
 class TileTracepoints < ActiveRecord::Migration[4.2]

-  class Tracepoint < ActiveRecord::Base
+  class Tracepoint < ApplicationRecord

     self.table_name = "gps_points"
   end
 
     self.table_name = "gps_points"
   end
 


@@ -10,14 +8,10 @@ class TileTracepoints < ActiveRecord::Migration[4.2]
     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"
 

-    if ENV["USE_DB_FUNCTIONS"]
-      Tracepoint.update_all("latitude = latitude * 10, longitude = longitude * 10, tile = tile_for_point(latitude * 10, longitude * 10)")
-    else
-      Tracepoint.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
 
     end
   end