Merge branch 'master' into notes

[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..91d5907265f191f8324827ca52f972f9943b1dc8 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,12 +1,14 @@
+require 'migrate'
+
 class TileTracepoints < ActiveRecord::Migration
   def self.up
     add_column "gps_points", "tile", :four_byte_unsigned
     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
+    else
       Tracepoint.find(:all).each do |tp|
         tp.latitude = tp.latitude * 10
         tp.longitude = tp.longitude * 10