Remove spurious comma that was breaking Safari.

[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 d9d782df0ac954aea49abcada732051e6a6e2de9..51a4d1376233c28ed88494b24f3c7eca71ee5a30 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,13 +1,23 @@
 class TileTracepoints < ActiveRecord::Migration
   def self.up
 class TileTracepoints < ActiveRecord::Migration
   def self.up

-    add_column "gps_points", "tile", :integer, :null => false, :options => "UNSIGNED"
+    add_column "gps_points", "tile", :integer, :null => false, :unsigned => true

     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"
 

-    Tracepoint.update_all("tile = tile_for_point(latitude, longitude)")
+    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
+    end

   end
 
   def self.down
   end
 
   def self.down

+    Tracepoint.update_all("latitude = latitude / 10, longitude = longitude / 10")
+

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