Merge remote-tracking branch 'upstream/master' into routing

[rails.git] / db / migrate / 054_refactor_map_bug_tables.rb

diff --git a/db/migrate/054_refactor_map_bug_tables.rb b/db/migrate/054_refactor_map_bug_tables.rb
index 6d259d20aae11e86d55d8b66d35174eefc7c8543..d94105035551c3739af29832d28d5deee1e8af32 100644 (file)
--- a/db/migrate/054_refactor_map_bug_tables.rb
+++ b/db/migrate/054_refactor_map_bug_tables.rb
@@ -1,9 +1,8 @@
-require 'lib/migrate'
+require 'migrate'
 
 class RefactorMapBugTables < ActiveRecord::Migration
   def self.up
     create_table :map_bug_comment do |t|
-      t.column :id, :bigint, :null => false
       t.column :bug_id, :bigint, :null => false
       t.boolean :visible, :null => false 
       t.datetime :date_created, :null => false
@@ -15,6 +14,8 @@ class RefactorMapBugTables < ActiveRecord::Migration
 
     remove_column :map_bugs, :text 
 
+    change_column :map_bug_comment, :id, :bigint
+
     add_index :map_bug_comment, [:bug_id], :name => "map_bug_comment_id_idx"
 
     add_foreign_key :map_bug_comment, [:bug_id], :map_bugs, [:id]