Merge remote-tracking branch 'openstreetmap/pull/1367'

[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 8bd9a930dd9e1cdf88ee28ff77e68afbceee9357..3cf268dd083e37aa9bb66ef4e4f619472a09786e 100644 (file)
--- a/db/migrate/023_add_changesets.rb
+++ b/db/migrate/023_add_changesets.rb
@@ -1,7 +1,7 @@
 require "migrate"
 
 class AddChangesets < ActiveRecord::Migration
-  @@conv_user_tables = %w(current_nodes current_relations current_ways nodes relations ways)
+  @conv_user_tables = %w(current_nodes current_relations current_ways nodes relations ways)
 
   def self.up
     create_table "changesets", :id => false do |t|
@@ -29,9 +29,9 @@ class AddChangesets < ActiveRecord::Migration
     # 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;"
+            "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"
@@ -40,7 +40,7 @@ class AddChangesets < ActiveRecord::Migration
 
   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