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

[rails.git] / db / migrate / 021_move_to_innodb.rb

diff --git a/db/migrate/021_move_to_innodb.rb b/db/migrate/021_move_to_innodb.rb
index 72a4607d9de028bff97bb6283c897da9ada84908..ce8d33de4eab3447bfd22eaa052958dc3bab40d1 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,19 +1,19 @@
-require 'migrate'
+require "migrate"
 
 class MoveToInnodb < ActiveRecord::Migration
-  @@conv_tables = %w(nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags)
+  @conv_tables = %w(nodes ways way_tags way_nodes current_way_tags relation_members relations relation_tags current_relation_tags)
 
-  @@ver_tbl = %w(nodes ways relations)
+  @ver_tbl = %w(nodes ways relations)
 
   def self.up
     remove_index :current_way_tags, :name => :current_way_tags_v_idx
     remove_index :current_relation_tags, :name => :current_relation_tags_v_idx
 
-    @@ver_tbl.each do |tbl|
+    @ver_tbl.each do |tbl|
       change_column tbl, "version", :bigint, :null => false
     end
 
-    @@ver_tbl.each do |tbl|
+    @ver_tbl.each do |tbl|
       add_column "current_#{tbl}", "version", :bigint, :null => false
       # As the initial version of all nodes, ways and relations is 0, we set the
       # current version to something less so that we can update the version in
@@ -36,6 +36,6 @@ class MoveToInnodb < ActiveRecord::Migration
   end
 
   def self.down
-    fail ActiveRecord::IrreversibleMigration
+    raise ActiveRecord::IrreversibleMigration
   end
 end