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

[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 db17f3c35d586c5cde47d021ca6edd3729a57b55..5d3bc4858bd37f91d5cca7a2c109832b84459b89 100644 (file)
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -1,30 +1,28 @@
-require 'migrate'
-
-class UserEnhancements < ActiveRecord::Migration
+class UserEnhancements < ActiveRecord::Migration[4.2]

   def self.up
   def self.up

-    add_column "diary_entries", "latitude", :double
-    add_column "diary_entries", "longitude", :double
+    add_column "diary_entries", "latitude", :float, :limit => 53
+    add_column "diary_entries", "longitude", :float, :limit => 53

     add_column "diary_entries", "language", :string, :limit => 3
 
     add_column "diary_entries", "language", :string, :limit => 3
 

-    create_table "user_preferences", innodb_table do |t|
-      t.column "user_id", :bigint, :limit => 20, :null => false
-      t.column "k",       :string, :null => false
-      t.column "v",       :string, :null => false
+    create_table "user_preferences", :id => false do |t|
+      t.column "user_id", :bigint, :null => false
+      t.column "k", :string, :null => false
+      t.column "v", :string, :null => false

     end
 
     end
 

-    add_primary_key "user_preferences", ["user_id", "k"]
+    add_primary_key "user_preferences", %w[user_id k]

 
 

-    create_table "user_tokens", innodb_table do |t|
-      t.column "id",      :bigint_pk, :null => false
-      t.column "user_id", :bigint,   :limit => 20, :null => false
-      t.column "token",   :string,   :null => false
-      t.column "expiry",  :datetime, :null => false
+    create_table "user_tokens", :id => false do |t|
+      t.column "id", :bigserial, :primary_key => true, :null => false
+      t.column "user_id", :bigint, :null => false
+      t.column "token", :string, :null => false
+      t.column "expiry", :datetime, :null => false

     end
 
     add_index "user_tokens", ["token"], :name => "user_tokens_token_idx", :unique => true
     add_index "user_tokens", ["user_id"], :name => "user_tokens_user_id_idx"
 
     end
 
     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.find(:all, :conditions => "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
 
       UserToken.create(:user_id => user.id, :token => user.token, :expiry => 1.week.from_now)
     end
 


@@ -35,14 +33,14 @@ class UserEnhancements < ActiveRecord::Migration
     add_column "users", "nearby", :integer, :default => 50
     add_column "users", "pass_salt", :string
 
     add_column "users", "nearby", :integer, :default => 50
     add_column "users", "pass_salt", :string
 

-    User.update_all("nearby = 50");
+    User.update_all("nearby = 50")

   end
 
   def self.down
     remove_column "users", "pass_salt"
     remove_column "users", "nearby"
   end
 
   def self.down
     remove_column "users", "pass_salt"
     remove_column "users", "nearby"

-    add_column "users", "within_lat", :double
-    add_column "users", "within_lon", :double
+    add_column "users", "within_lat", :float, :limit => 53
+    add_column "users", "within_lon", :float, :limit => 53

     add_column "users", "timeout", :datetime
     add_column "users", "token", :string
 
     add_column "users", "timeout", :datetime
     add_column "users", "token", :string