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 95ed7d9cedac1235756aa763582016e1e9fef08c..a9d6831515e3eaeff32e132963d288067ae1e073 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


@@ -12,11 +12,7 @@ class CreateLanguages < ActiveRecord::Migration
 
     Language.load("#{Rails.root}/config/languages.yml")
 
 
     Language.load("#{Rails.root}/config/languages.yml")
 

-    add_foreign_key :users, [:locale], :languages, [:code]
-    add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
-  end
-
-  def self.down
-    raise ActiveRecord::IrreversibleMigration
+    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