Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

[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 daaf2199190d4c1669415bcf8633843cb5337956..603ad30665fb317ef137ed7c8ecabb26c4d6f14c 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,27 +1,18 @@
-require 'lib/migrate'
+require "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[5.0]
+  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]
 
-    Language.create do |l|
-      l.code = 'en'
-      l.name = 'English'
-      l.translation_available = true
-    end
-
-    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
-