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

[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 1f27ec79e6c48a981725843763ba9c0c203a7da5..d13ada1706b404b52d321f3023bc473bf5a59a01 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,9 +1,17 @@
 require "migrate"
 
-class TileNodes < ActiveRecord::Migration
+class TileNodes < ActiveRecord::Migration[4.2]
+  class Node < ApplicationRecord
+    self.table_name = "current_nodes"
+  end
+
+  class OldNode < ApplicationRecord
+    self.table_name = "nodes"
+  end
+
   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]
-      execute <<-SQL
+      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,
@@ -12,7 +20,7 @@ class TileNodes < ActiveRecord::Migration
       FROM #{from_table}
       SQL
     else
-      execute <<-SQL
+      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
@@ -24,7 +32,7 @@ class TileNodes < ActiveRecord::Migration
   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