X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/09c5740b5bb94c75a5c8c83cdbb80ae7b5ccbdf4..9ae3df1a785fb2e71c7431fc69a1c2ac4204ba8c:/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 39e224c06..bae5a3cad 100644
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,32 +1,34 @@
-require 'lib/migrate'
+require "migrate"
 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up
-    create_enumeration :user_role_enum, ["administrator", "moderator"]
+    create_enumeration :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
 
-      t.timestamps
+      t.timestamps :null => true
     end
-    add_column :user_roles, :role, :user_role_enum, :null => false
 
-    User.all(:conditions => ['administrator = ?', true]).each do |user|
+    User.where(:administrator => true).each do |user|
       UserRole.create(:user_id => user.id, :role => "administrator")
     end
+
     remove_column :users, :administrator
 
-    add_foreign_key :user_roles, [:user_id], :users, [:id]
-    add_index :user_roles, [:user_id]
+    add_foreign_key :user_roles, :users, :name => "user_roles_user_id_fkey"
   end
 
   def self.down
     add_column :users, :administrator, :boolean, :default => false, :null => false
-    UserRole.all(:conditions => ['role = ?', "administrator"]).each do |role|
+
+    UserRole.where(:role => "administrator").each do |role|
       user = User.find(role.user_id)
       user.administrator = true
       user.save!
     end
+
     drop_table :user_roles
     drop_enumeration :user_role_enum
   end