Merge changes from trunk 7673:8632.

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

diff --git a/db/migrate/014_move_to_innodb.rb b/db/migrate/014_move_to_innodb.rb
index 38c741ccad832dfd2baf534b925fddd235d27575..c551b0ef812cb3ee09e3d9fa27ea336f2ad16000 100644 (file)
--- a/db/migrate/014_move_to_innodb.rb
+++ b/db/migrate/014_move_to_innodb.rb
@@ -1,7 +1,7 @@
 class MoveToInnodb < ActiveRecord::Migration
   @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes',
-    'current_way_nodes', 'relation_members', 'relations',
-    'relation_tags', 'current_relation_tags']
+    'current_way_tags', 'relation_members',
+    'relations', 'relation_tags', 'current_relation_tags']
 
   @@ver_tbl = ['nodes', 'ways', 'relations']
 
@@ -20,10 +20,11 @@ class MoveToInnodb < ActiveRecord::Migration
     @@ver_tbl.each { |tbl|
       add_column "current_#{tbl}", "version", :bigint, :limit => 20, :null => false
       execute "UPDATE current_#{tbl} SET version = " +
-       "(SELECT max(version)+1 FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)"
+       "(SELECT max(version) FROM #{tbl} WHERE #{tbl}.id = current_#{tbl}.id)"
     }
   end
 
   def self.down
+    raise IrreversibleMigration.new
   end
 end