Fix server error when user#reset_password called with no token

[rails.git] / db / migrate / 006_tile_nodes.rb

diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index 51b2502d7448d976fe3883dbbf123b9c709ef6be..b56a095a44bee5499085ee9c339cd237e310adcd 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,8 +1,8 @@
-require 'lib/migrate'
+require 'migrate'

 
 class TileNodes < ActiveRecord::Migration
   def self.upgrade_table(from_table, to_table, model)
 
 class TileNodes < ActiveRecord::Migration
   def self.upgrade_table(from_table, to_table, model)

-    begin
+    if ENV["USE_DB_FUNCTIONS"]

       execute <<-END_SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
       execute <<-END_SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),


@@ -11,7 +11,7 @@ class TileNodes < ActiveRecord::Migration
                             CAST(ROUND(longitude * 10000000) AS INTEGER))
       FROM #{from_table}
       END_SQL
                             CAST(ROUND(longitude * 10000000) AS INTEGER))
       FROM #{from_table}
       END_SQL

-    rescue ActiveRecord::StatementInvalid => ex
+    else

       execute <<-END_SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),
       execute <<-END_SQL
       INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp, tile)
       SELECT id, ROUND(latitude * 10000000), ROUND(longitude * 10000000),