Merge remote-tracking branch 'upstream/pull/5374'

[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 ecad2f5dcd50478217ba569baa9d268c6fcce7e2..15730bd8e325ce9f608f7fccda1c481f81bf2d3c 100644 (file)
--- a/db/migrate/010_diary_comments.rb
+++ b/db/migrate/010_diary_comments.rb
@@ -1,18 +1,15 @@
-require 'migrate'
-
-class DiaryComments < ActiveRecord::Migration
+class DiaryComments < ActiveRecord::Migration[4.2]

   def self.up
   def self.up

-    create_table "diary_comments", myisam_table do |t|
-      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
-      t.column "created_at",     :datetime,               :null => false
-      t.column "updated_at",     :datetime,               :null => false
+    create_table "diary_comments", :id => false do |t|
+      t.column "id",             :bigserial, :primary_key => true, :null => false
+      t.column "diary_entry_id", :bigint, :null => false
+      t.column "user_id",        :bigint, :null => false
+      t.column "body",           :text, :null => false
+      t.column "created_at",     :datetime, :null => false
+      t.column "updated_at",     :datetime, :null => false

     end
 
     end
 

-    add_index "diary_comments", ["diary_entry_id", "id"], :name => "diary_comments_entry_id_idx", :unique => true
-
+    add_index "diary_comments", %w[diary_entry_id id], :name => "diary_comments_entry_id_idx", :unique => true

   end
 
   def self.down
   end
 
   def self.down