Add user_id + created_at index to changesets

[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 dc4755ac3bbffeb4c53031bd70c24940437664d1..4f40a5f398a2f7732d0db78a0f3bcf1f7aba5895 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,15 +1,17 @@
+require 'lib/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),
              user_id, visible, tags, timestamp,
       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
       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),