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

[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..e4725b64345e9e56d3c01e2554ea86bb5ea224aa 100644 (file)
--- a/db/migrate/013_add_email_valid.rb
+++ b/db/migrate/013_add_email_valid.rb
@@ -1,7 +1,10 @@
-class AddEmailValid < ActiveRecord::Migration
+class AddEmailValid < ActiveRecord::Migration[4.2]
+  class User < ApplicationRecord
+  end
+
   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