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

[rails.git] / db / migrate / 051_add_status_to_user.rb

diff --git a/db/migrate/051_add_status_to_user.rb b/db/migrate/051_add_status_to_user.rb
index 5cf8a920f50e0f2e0d290bc32e91e85de4f1f1da..bea9f125f62a25e3e351be5306ed9f6ee7396ceb 100644 (file)
--- a/db/migrate/051_add_status_to_user.rb
+++ b/db/migrate/051_add_status_to_user.rb
@@ -1,11 +1,9 @@
-require "migrate"
-

 class AddStatusToUser < ActiveRecord::Migration[4.2]
 class AddStatusToUser < ActiveRecord::Migration[4.2]

-  class User < ActiveRecord::Base
+  class User < ApplicationRecord

   end
 
   def self.up
   end
 
   def self.up

-    create_enumeration :user_status_enum, %w[pending active confirmed suspended deleted]
+    create_enum :user_status_enum, %w[pending active confirmed suspended deleted]

 
     add_column :users, :status, :user_status_enum, :null => false, :default => "pending"
 
 
     add_column :users, :status, :user_status_enum, :null => false, :default => "pending"