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

[rails.git] / db / migrate / 044_create_user_roles.rb

diff --git a/db/migrate/044_create_user_roles.rb b/db/migrate/044_create_user_roles.rb
index 0098a0086a60d64c77c5bddcfd0149a0339199ca..ca00d15d4cda81b8acc8ec9377847d2200050527 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,14 +1,12 @@
-require "migrate"
-

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

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

   end
 
   end
 

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

   end
 
   def self.up
   end
 
   def self.up

-    create_enumeration :user_role_enum, %w[administrator moderator]
+    create_enum :user_role_enum, %w[administrator moderator]

 
     create_table :user_roles do |t|
       t.column :user_id, :bigint, :null => false
 
     create_table :user_roles do |t|
       t.column :user_id, :bigint, :null => false