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

[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 b5e43940628620c264a1c30237d48f893ce907ca..ca00d15d4cda81b8acc8ec9377847d2200050527 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,14 +1,18 @@
-require "migrate"
+class CreateUserRoles < ActiveRecord::Migration[4.2]
+  class User < ApplicationRecord
+  end
+
+  class UserRole < ApplicationRecord
+  end

 
 

-class CreateUserRoles < ActiveRecord::Migration

   def self.up
   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
       t.column :role, :user_role_enum, :null => false
 
 
     create_table :user_roles do |t|
       t.column :user_id, :bigint, :null => false
       t.column :role, :user_role_enum, :null => false
 

-      t.timestamps
+      t.timestamps :null => true

     end
 
     User.where(:administrator => true).each do |user|
     end
 
     User.where(:administrator => true).each do |user|