Merge pull request #35 from tomhughes/routing

[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..a9d6831515e3eaeff32e132963d288067ae1e073 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
 
 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
+  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 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}/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

-