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

[rails.git] / db / migrate / 035_change_user_locale.rb

diff --git a/db/migrate/035_change_user_locale.rb b/db/migrate/035_change_user_locale.rb
index bfb43056a5bc741285aaa36c0ff05f2fc8ef163f..d1315fa0669634ec2550017ac3bffb1d751e7a07 100644 (file)
--- a/db/migrate/035_change_user_locale.rb
+++ b/db/migrate/035_change_user_locale.rb
@@ -1,8 +1,6 @@
-require 'migrate'
-
-class ChangeUserLocale < ActiveRecord::Migration
+class ChangeUserLocale < ActiveRecord::Migration[4.2]
   def self.up
-    remove_foreign_key :users, [:locale], :languages, [:code]
+    remove_foreign_key :users, :column => :locale, :name => "users_locale_fkey"
 
     rename_column :users, :locale, :languages
   end
@@ -10,6 +8,6 @@ class ChangeUserLocale < ActiveRecord::Migration
   def self.down
     rename_column :users, :languages, :locale
 
-    add_foreign_key :users, [:locale], :languages, [:code]
+    add_foreign_key :users, :languages, :column => :locale, :primary_key => :code, :name => "users_locale_fkey"
   end
 end