Merge pull request #24 from zerebubuth/routing-merge

[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 9f17461b17bd25bc0a88f53b71d8e9f6bae2fe05..d429b6fdc8fe36408cdb61d87adb4a159048ade1 100644 (file)
--- a/db/migrate/005_tile_tracepoints.rb
+++ b/db/migrate/005_tile_tracepoints.rb
@@ -1,4 +1,4 @@
-require 'lib/migrate'
+require 'migrate'
 
 class TileTracepoints < ActiveRecord::Migration
   def self.up
@@ -6,10 +6,10 @@ class TileTracepoints < ActiveRecord::Migration
     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!