Merge pull request #35 from tomhughes/routing

[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 8312dec2c92213b63cff6ea00161ea19b813a6ba..030515a98ec34ee03ae45f642083378ea48cd606 100644 (file)
--- a/db/migrate/021_move_to_innodb.rb
+++ b/db/migrate/021_move_to_innodb.rb
@@ -1,4 +1,4 @@
-require 'lib/migrate'
+require 'migrate'

 
 class MoveToInnodb < ActiveRecord::Migration
   @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes',
 
 class MoveToInnodb < ActiveRecord::Migration
   @@conv_tables = ['nodes', 'ways', 'way_tags', 'way_nodes',


@@ -12,15 +12,11 @@ class MoveToInnodb < ActiveRecord::Migration
     remove_index :current_relation_tags, :name=> :current_relation_tags_v_idx
 
     @@ver_tbl.each { |tbl|
     remove_index :current_relation_tags, :name=> :current_relation_tags_v_idx
 
     @@ver_tbl.each { |tbl|

-      change_column tbl, "version", :bigint, :limit => 20, :null => false
-    }
-
-    @@conv_tables.each { |tbl|
-      change_engine (tbl, "InnoDB")
+      change_column tbl, "version", :bigint, :null => false

     }
 
     @@ver_tbl.each { |tbl|
     }
 
     @@ver_tbl.each { |tbl|

-      add_column "current_#{tbl}", "version", :bigint, :limit => 20, :null => false
+      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 
       # batches of 10000
       # 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 
       # batches of 10000


@@ -42,6 +38,6 @@ class MoveToInnodb < ActiveRecord::Migration
   end
 
   def self.down
   end
 
   def self.down

-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration

   end
 end
   end
 end