X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4adeeb51adaecbb1dddf07c0f5253de050963e35..5781674c1b8c4935afd786246705460f7bd38b6d:/db/migrate/006_tile_nodes.rb

diff --git a/db/migrate/006_tile_nodes.rb b/db/migrate/006_tile_nodes.rb
index dc4755ac3..91f8acb6b 100644
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,15 +1,17 @@
+require 'migrate'
+
 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),
              user_id, visible, tags, timestamp,
-             tile_for_point(CAST(ROUND(latitude * 10000000) AS UNSIGNED),
-                            CAST(ROUND(longitude * 10000000) AS UNSIGNED))
+             tile_for_point(CAST(ROUND(latitude * 10000000) AS INTEGER),
+                            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),
@@ -17,7 +19,7 @@ class TileNodes < ActiveRecord::Migration
       FROM #{from_table}
       END_SQL
 
-      model.find(:all).each do |n|
+      model.all.each do |n|
         n.save!
       end
     end