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

[rails.git] / db / migrate / 004_user_enhancements.rb

diff --git a/db/migrate/004_user_enhancements.rb b/db/migrate/004_user_enhancements.rb
index d12b02c0a9ffa7b23c30483733e3dcbc8dd8f47b..5d3bc4858bd37f91d5cca7a2c109832b84459b89 100644 (file)
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -1,5 +1,3 @@
-require "migrate"
-
 class UserEnhancements < ActiveRecord::Migration[4.2]
   def self.up
     add_column "diary_entries", "latitude", :float, :limit => 53
@@ -24,7 +22,7 @@ class UserEnhancements < ActiveRecord::Migration[4.2]
     add_index "user_tokens", ["token"], :name => "user_tokens_token_idx", :unique => true
     add_index "user_tokens", ["user_id"], :name => "user_tokens_user_id_idx"
 
-    User.where("token is not null").each do |user|
+    User.where.not(:token => nil).each do |user|
       UserToken.create(:user_id => user.id, :token => user.token, :expiry => 1.week.from_now)
     end