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

[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 29200d06a52f29b12f28533003a848e5b77a1a14..ca898cb37b197f6f9c77ae386dc277a56d744973 100644 (file)
--- a/db/migrate/006_tile_nodes.rb
+++ b/db/migrate/006_tile_nodes.rb
@@ -1,35 +1,43 @@
 require "migrate"
 
 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"]
   def self.upgrade_table(from_table, to_table, model)
     if ENV["USE_DB_FUNCTIONS"]

-      execute <<-END_SQL
+      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}
       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}

-      END_SQL
+      SQL

     else
     else

-      execute <<-END_SQL
+      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}
       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}

-      END_SQL
+      SQL

 
       model.all.each(&:save!)
     end
   end
 
   def self.downgrade_table(from_table, to_table)
 
       model.all.each(&:save!)
     end
   end
 
   def self.downgrade_table(from_table, to_table)

-    execute <<-END_SQL
+    execute <<-SQL

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

-    END_SQL
+    SQL

   end
 
   def self.up
   end
 
   def self.up