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

[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 848dc972418c5c762c6e97707abed2bcba4b44b4..7fdb34e5782c60e56ffe9da29ded0177778601cf 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,17 +1,15 @@
-require "migrate"
-

 class TileNodes < ActiveRecord::Migration[4.2]
 class TileNodes < ActiveRecord::Migration[4.2]

-  class Node < ActiveRecord::Base
+  class Node < ApplicationRecord

     self.table_name = "current_nodes"
   end
 
     self.table_name = "current_nodes"
   end
 

-  class OldNode < ActiveRecord::Base
+  class OldNode < ApplicationRecord

     self.table_name = "nodes"
   end
 
   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]
     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,
       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,


@@ -20,7 +18,7 @@ class TileNodes < ActiveRecord::Migration[4.2]
       FROM #{from_table}
       SQL
     else
       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
       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


@@ -32,7 +30,7 @@ class TileNodes < ActiveRecord::Migration[4.2]
   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