Merge remote-tracking branch 'upstream/pull/5319'

[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 138168a7b597985dce07d7f7585efbd48259f2b8..a7f9b1af0fb8658182e9c5a2279fe2d6a5326952 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,30 +1,25 @@
-require "migrate"
+class TileNodes < ActiveRecord::Migration[4.2]
+  class Node < ApplicationRecord
+    self.table_name = "current_nodes"
+  end
+
+  class OldNode < ApplicationRecord
+    self.table_name = "nodes"
+  end

 
 

-class TileNodes < ActiveRecord::Migration[5.0]

   def self.upgrade_table(from_table, to_table, model)
   def self.upgrade_table(from_table, to_table, model)

-    if ENV["USE_DB_FUNCTIONS"]
-      execute <<-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 INTEGER),
-                            CAST(ROUND(longitude * 10000000) AS INTEGER))
-      FROM #{from_table}
-      SQL
-    else
-      execute <<-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, 0
-      FROM #{from_table}
-      SQL
-
-      model.all.each(&:save!)
-    end
+    execute <<-SQL.squish
+    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, 0
+    FROM #{from_table}
+    SQL
+
+    model.all.each(&:save!)

   end
 
   def self.downgrade_table(from_table, to_table)
   end
 
   def self.downgrade_table(from_table, to_table)

-    execute <<-SQL
+    execute <<-SQL.squish

     INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp)
     SELECT id, latitude / 10000000, longitude / 10000000,
            user_id, visible, tags, timestamp
     INSERT INTO #{to_table} (id, latitude, longitude, user_id, visible, tags, timestamp)
     SELECT id, latitude / 10000000, longitude / 10000000,
            user_id, visible, tags, timestamp