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

[rails.git] / db / migrate / 023_add_changesets.rb

diff --git a/db/migrate/023_add_changesets.rb b/db/migrate/023_add_changesets.rb
index b544947590d4004ac49edae95ffc13b3789f8f69..ff6ce2bb4356db29f5680b3d871edde95699572b 100644 (file)
--- a/db/migrate/023_add_changesets.rb
+++ b/db/migrate/023_add_changesets.rb
@@ -1,7 +1,5 @@
-require 'migrate'
-
-class AddChangesets < ActiveRecord::Migration
-  @@conv_user_tables = %w(current_nodes current_relations current_ways nodes relations ways)
+class AddChangesets < ActiveRecord::Migration[4.2]
+  @conv_user_tables = %w[current_nodes current_relations current_ways nodes relations ways]

 
   def self.up
     create_table "changesets", :id => false do |t|
 
   def self.up
     create_table "changesets", :id => false do |t|


@@ -28,10 +26,10 @@ class AddChangesets < ActiveRecord::Migration
     # all edits up to the API change,
     # all the changesets will have the id of the user that made them.
     # We need to generate a changeset for each user in the database
     # all edits up to the API change,
     # all the changesets will have the id of the user that made them.
     # We need to generate a changeset for each user in the database

-    execute "INSERT INTO changesets (id, user_id, created_at, open)" +
-      "SELECT id, id, creation_time, false from users;"
+    execute "INSERT INTO changesets (id, user_id, created_at, open)" \
+            "SELECT id, id, creation_time, false from users;"

 
 

-    @@conv_user_tables.each do |tbl|
+    @conv_user_tables.each do |tbl|

       rename_column tbl, :user_id, :changeset_id
       # foreign keys too
       add_foreign_key tbl, :changesets, :name => "#{tbl}_changeset_id_fkey"
       rename_column tbl, :user_id, :changeset_id
       # foreign keys too
       add_foreign_key tbl, :changesets, :name => "#{tbl}_changeset_id_fkey"


@@ -40,7 +38,7 @@ class AddChangesets < ActiveRecord::Migration
 
   def self.down
     # It's not easy to generate the user ids from the changesets
 
   def self.down
     # It's not easy to generate the user ids from the changesets

-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration

     # drop_table "changesets"
     # drop_table "changeset_tags"
   end
     # drop_table "changesets"
     # drop_table "changeset_tags"
   end