Merge branch 'master' into openid

[rails.git] / db / migrate / 010_diary_comments.rb

diff --git a/db/migrate/010_diary_comments.rb b/db/migrate/010_diary_comments.rb
index be07d851ae96cfd4918b5ebb4d2c3d2130384ff8..bf73199121bf01416a89f968948a91883e039e8f 100644 (file)
--- a/db/migrate/010_diary_comments.rb
+++ b/db/migrate/010_diary_comments.rb
@@ -1,7 +1,9 @@
+require 'lib/migrate'
+
 class DiaryComments < ActiveRecord::Migration
   def self.up
     create_table "diary_comments", myisam_table do |t|
-      t.column "id",             :bigint,   :limit => 20, :null => false
+      t.column "id",             :bigint_pk,              :null => false
       t.column "diary_entry_id", :bigint,   :limit => 20, :null => false
       t.column "user_id",        :bigint,   :limit => 20, :null => false
       t.column "body",           :text,                   :null => false
@@ -9,10 +11,8 @@ class DiaryComments < ActiveRecord::Migration
       t.column "updated_at",     :datetime,               :null => false
     end
 
-    add_primary_key "diary_comments", ["id"]
     add_index "diary_comments", ["diary_entry_id", "id"], :name => "diary_comments_entry_id_idx", :unique => true
 
-    change_column "diary_comments", "id", :bigint, :limit => 20, :null => false, :options => "AUTO_INCREMENT"
   end
 
   def self.down