Merge branch 'master' into openstreetbugs

[rails.git] / db / migrate / 013_add_email_valid.rb

diff --git a/db/migrate/013_add_email_valid.rb b/db/migrate/013_add_email_valid.rb
index 2192383bda2e73a65c54dddb9e20e37f40d853a3..a0180970109a8ea212b013c359e75f3832009080 100644 (file)
--- a/db/migrate/013_add_email_valid.rb
+++ b/db/migrate/013_add_email_valid.rb
@@ -1,7 +1,7 @@
 class AddEmailValid < ActiveRecord::Migration
   def self.up
     add_column "users", "email_valid", :boolean, :default => false, :null => false
 class AddEmailValid < ActiveRecord::Migration
   def self.up
     add_column "users", "email_valid", :boolean, :default => false, :null => false

-    User.update_all(:email_valid => true)
+    User.update_all("email_valid = (active != 0)") #email_valid is :boolean, but active is :integer. "email_valid = active" (see r11802 or earlier) will fail for stricter dbs than mysql

   end
 
   def self.down
   end
 
   def self.down