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

[rails.git] / db / migrate / 034_create_languages.rb

diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb
index ca9552d98298f6eafe559f6c581844a5985c5e37..24590355168c4d89b60fd420a2855945cef24244 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,23 +1,16 @@
-require 'lib/migrate'
-
-class CreateLanguages < ActiveRecord::Migration
-  def self.up
-    create_table :languages, innodb_table do |t|
-      t.string :code, :limit => 5, :null => false
-      t.string :name, :null => false
-      t.boolean :translation_available, :null => false, :default => false
+class CreateLanguages < ActiveRecord::Migration[4.2]
+  def change
+    create_table :languages, :id => false do |t|
+      t.string :code, :null => false
+      t.string :english_name, :null => false
+      t.string :native_name

     end
 
     add_primary_key :languages, [:code]
 
     end
 
     add_primary_key :languages, [:code]
 

-    Language.create(:code => 'en', :name => 'English', :translation_available => true)
-
-    add_foreign_key :users, [:locale], :languages, [:code]
-    add_foreign_key :diary_entries, [:language], :languages, [:code]    
-  end
+    Language.load(Rails.root.join("config/languages.yml"))

 
 

-  def self.down
-    raise IrreversibleMigration.new
+    add_foreign_key :users, :languages, :column => :locale, :primary_key => :code, :name => "users_locale_fkey"
+    add_foreign_key :diary_entries, :languages, :column => :language_code, :primary_key => :code, :name => "diary_entries_language_code_fkey"

   end
 end
   end
 end

-