Merge remote-tracking branch 'openstreetmap/pull/788'

[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 cb6c392637e04931b1127b9c9281cb8767d26fda..05a70e7a9771092d1645fad3df60c107295dde08 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,8 +1,8 @@
-require 'lib/migrate'
+require "migrate"

 
 class CreateLanguages < ActiveRecord::Migration
 
 class CreateLanguages < ActiveRecord::Migration

-  def self.up
-    create_table :languages, innodb_table do |t|
+  def change
+    create_table :languages, :id => false do |t|

       t.string :code, :null => false
       t.string :english_name, :null => false
       t.string :native_name
       t.string :code, :null => false
       t.string :english_name, :null => false
       t.string :native_name


@@ -10,20 +10,9 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
 
     add_primary_key :languages, [:code]
 

-    YAML.load(File.read(RAILS_ROOT + "/config/languages.yml")).each do |k,v|
-      Language.create do |l|
-        l.code = k
-        l.english_name = v["english"]
-        l.native_name = v["native"]
-      end
-    end
-
-    add_foreign_key :users, [:locale], :languages, [:code]
-    add_foreign_key :diary_entries, [:language], :languages, [:code]    
-  end
+    Language.load("#{Rails.root}/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

-