Merge branch 'comments'

[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 10ec3ee7bf86ab236e8442be3103ffbeda72d084..0db3ea77e5fc01976419aa297ddad97b3b5b6152 100644 (file)
--- a/db/migrate/044_create_user_roles.rb
+++ b/db/migrate/044_create_user_roles.rb
@@ -1,4 +1,4 @@
-require 'lib/migrate'
+require 'migrate'

 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up
 
 class CreateUserRoles < ActiveRecord::Migration
   def self.up


@@ -11,7 +11,7 @@ class CreateUserRoles < ActiveRecord::Migration
     end
     add_column :user_roles, :role, :user_role_enum, :null => false
 
     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
       UserRole.create(:user_id => user.id, :role => "administrator")
     end
     remove_column :users, :administrator


@@ -21,7 +21,7 @@ class CreateUserRoles < ActiveRecord::Migration
 
   def self.down
     add_column :users, :administrator, :boolean, :default => false, :null => false
 
   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!
       user = User.find(role.user_id)
       user.administrator = true
       user.save!