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

[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 8b352be3eed7eadd75feecd87b10ee7d76643760..d12b02c0a9ffa7b23c30483733e3dcbc8dd8f47b 100644 (file)
--- a/db/migrate/004_user_enhancements.rb
+++ b/db/migrate/004_user_enhancements.rb
@@ -1,6 +1,6 @@
-require 'migrate'
+require "migrate"

 
 

-class UserEnhancements < ActiveRecord::Migration
+class UserEnhancements < ActiveRecord::Migration[4.2]

   def self.up
     add_column "diary_entries", "latitude", :float, :limit => 53
     add_column "diary_entries", "longitude", :float, :limit => 53
   def self.up
     add_column "diary_entries", "latitude", :float, :limit => 53
     add_column "diary_entries", "longitude", :float, :limit => 53


@@ -12,7 +12,7 @@ class UserEnhancements < ActiveRecord::Migration
       t.column "v", :string, :null => false
     end
 
       t.column "v", :string, :null => false
     end
 

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

 
     create_table "user_tokens", :id => false do |t|
       t.column "id", :bigserial, :primary_key => true, :null => false
 
     create_table "user_tokens", :id => false do |t|
       t.column "id", :bigserial, :primary_key => true, :null => false


@@ -35,7 +35,7 @@ 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
   end
 
   def self.down