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

[rails.git] / db / migrate / 20120404205604_add_user_and_description_to_redaction.rb

diff --git a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
index 05c75d37e43b7e7c12c92c64920f4437cca166e1..56ef052533239da7bbd05b13f8d95da41126fc02 100644 (file)
--- a/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
+++ b/db/migrate/20120404205604_add_user_and_description_to_redaction.rb
@@ -1,17 +1,8 @@
-require 'migrate'
-
-class AddUserAndDescriptionToRedaction < ActiveRecord::Migration
-  def up
+class AddUserAndDescriptionToRedaction < ActiveRecord::Migration[4.2]
+  def change
     add_column :redactions, :user_id, :bigint, :null => false
     add_column :redactions, :description_format, :format_enum, :null => false, :default => "markdown"
 
-    add_foreign_key :redactions, [:user_id], :users, [:id]
-  end
-
-  def down
-    remove_foreign_key :redactions, [:user_id], :users, [:id]
-
-    remove_column :redactions, :description_format
-    remove_column :redactions, :user_id
+    add_foreign_key :redactions, :users, :name => "redactions_user_id_fkey"
   end
 end